Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

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;
         }
         // 这个事件已经被查看了

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`;