diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java
index 6f8afd1418..10250f27a1 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java
@@ -1,6 +1,7 @@
package com.epmet.mq.listener.listener;
import com.alibaba.fastjson.JSON;
+import com.epmet.auth.constants.AuthOperationConstants;
import com.epmet.auth.constants.AuthOperationEnum;
import com.epmet.commons.rocketmq.constants.MQUserPropertys;
import com.epmet.commons.rocketmq.messages.LoginMQMsg;
@@ -77,7 +78,11 @@ public class AuthOperationLogListener implements MessageListenerConcurrently {
logEntity.setOperatorName(operatorInfo.getName());
logEntity.setOperatorMobile(operatorInfo.getMobile());
logEntity.setOperatingTime(msgObj.getLoginTime());
- logEntity.setContent("成功登录系统");
+ if(AuthOperationConstants.LOGIN.equals(logEntity.getType())){
+ logEntity.setContent("成功登录系统");
+ }else{
+ logEntity.setContent("成功退出系统");
+ }
DistributedLock distributedLock = null;
RLock lock = null;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index bd7853c4e0..d7e0d5ff39 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -28,6 +28,7 @@
and e.GRID_ID=#{orgId}
+ and e.DEL_FLAG = '0'
and CUSTOMER_ID = #{customerId}
and HAPPEN_TIME >= #{queryStartTime}
and HAPPEN_TIME #{queryEndTime}
@@ -81,7 +82,8 @@
select date_format(e.HAPPEN_TIME, '%Y-%m') monthName
from ic_event e
- e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m')
+ e.DEL_FLAG = '0'
+ and e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m')
and e.HAPPEN_TIME date_format(#{queryEndTime}, '%Y-%m')
and e.GRID_ID =#{orgId}