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 | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 87cac8d..456d431 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -5,9 +5,13 @@
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;
@@ -202,11 +206,17 @@
@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