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

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -625,8 +625,8 @@ public class IcEventController {
     public Result updateReply(@RequestBody IcEventReplyFormDTO formDTO) {
         icEventReplyService.updateByReplyId(formDTO);
         if (null != formDTO.getIcEventId()) {
-            IcEventDTO entity = icEventService.get(formDTO.getId());
+            IcEventDTO entity = icEventService.get(formDTO.getIcEventId());
-            if (formDTO.getManageStatus() > entity.getReplyStatus()) {
+            if (null == entity.getReplyStatus() || formDTO.getManageStatus() > entity.getReplyStatus()) {
                 entity.setReplyStatus(formDTO.getManageStatus());
                 icEventService.update(entity);
             }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -802,7 +802,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         if (null == entity.getReplyStatus()) {
             //如果事件没有处理，则该事件待响应，并同步更新事件处理状态
             entity.setReplyStatus(formDTO.getManageStatus());
-        } else if (entity.getReplyStatus() > formDTO.getManageStatus()) {
+        } else if (entity.getReplyStatus() < formDTO.getManageStatus()) {
             //如果事件已经存在处理流程，且当前处理流程状态大于之前的状态则更新最新的处理状态
             entity.setReplyStatus(formDTO.getManageStatus());
         }