From 519b464e4ed3d07bd5aa23a4067e5869058de2e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:36:51 +0800
Subject: [PATCH] 添加统计日志
---
server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
index 229dc43..456d431 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -4,6 +4,14 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
+<<<<<<< HEAD
+<<<<<<< HEAD
+import doumeemes.core.utils.DateUtil;
+=======
+>>>>>>> 1.0.3
+=======
+import doumeemes.core.utils.DateUtil;
+>>>>>>> dev
import doumeemes.dao.ext.dto.ActivityLoginDTO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.vo.ActivityLoginVO;
@@ -20,11 +28,11 @@
import doumeemes.service.aware.DepartmentDataPermissionAware;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -197,6 +205,18 @@
@Override
public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
+<<<<<<< HEAD
+<<<<<<< HEAD
+ if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
+ activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
+ }
+=======
+>>>>>>> 1.0.3
+=======
+ if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
+ activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
+ }
+>>>>>>> dev
return systemUserMapper.activityLoginVOList(activityLoginDTO);
}
--
Gitblit v1.9.3