From 4c89b5c531e1729f5ca657f217267a440705f92c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 6 Jan 2022 14:04:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=8A=A5?=
 =?UTF-8?q?=E4=BA=8B=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8E=E3=80=82=20=E5=B1=85=E6=B0=91=E7=AB=AF=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E4=BA=8B-=E3=80=8B=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index f1ecf84da6..3c5b66a824 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -157,8 +157,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
         ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
-        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) || null == resiEventMentionEntity) {
-            log.warn("其他用户（非报事人、非被@的人）不需要调用此接口，直接返回");
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) || null != resiEventMentionEntity) {
+            log.warn("报事人、被@的人不需要调用此接口，直接返回");
             return;
         }
         // 这个事件已经被查看了

From 2e848062c865b06f87538254a13bb6e7e349ee92 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 6 Jan 2022 14:15:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BE=8B=E8=A1=8C?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V0.0.22__user_routine_count.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.22__user_routine_count.sql

diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.22__user_routine_count.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.22__user_routine_count.sql
new file mode 100644
index 0000000000..94bec2bc2b
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.22__user_routine_count.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `epmet_user`.`stats_staff_patrol_record_daily`
+    ADD COLUMN `ROUTINE_WORK_COUNT` int(11) NULL DEFAULT 0 COMMENT '例行工作次数 来自例行工作表' AFTER `LATEST_PATROL_STATUS`;