diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index a6fa566967..12d8ddc2ad 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -626,7 +626,7 @@ public class IcEventController { icEventReplyService.updateByReplyId(formDTO); if (null != formDTO.getIcEventId()) { 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); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index eacefe3c01..6db34156ac 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/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 formDTO.getManageStatus()) { + } else if (entity.getReplyStatus() < formDTO.getManageStatus()) { //如果事件已经存在处理流程,且当前处理流程状态大于之前的状态则更新最新的处理状态 entity.setReplyStatus(formDTO.getManageStatus()); }