【工作端小程序接口】议题处理逻辑修改-王公峰-2020-08-04

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -250,6 +250,11 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         if (checkAlreadyReviewed(dto.getId())) {
             return new Result().error("议题已存在");
         }
+        EpdcEventsEntity eventsEntity = baseDao.selectById(dto.getId());
+        if (dto.getHandlerDeptId().longValue() != eventsEntity.getGridId().longValue()) {
+            return new Result().error("请选择正确的处理部门");
+        }
+
         EpdcEventsEntity entity = new EpdcEventsEntity();
         entity.setId(dto.getId());
         entity.setEventState(dto.getEventState());
@@ -268,8 +273,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         String imageType = ImageConstant.TYPE_IMAGE_BIZ_EVENTS_REJECT;
         String referenceId = dto.getId();
 
-        EpdcEventsEntity eventsEntity = baseDao.selectById(dto.getId());
-
         // 组装发送消息内容
         EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
         informationFormDTO.setUserId(eventsEntity.getUserId());
@@ -279,10 +282,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE__BUSINESS_TYPE_EVENT);
         informationFormDTO.setBusinessId(eventsEntity.getId());
 
-        if (dto.getHandlerDeptId().longValue() != eventsEntity.getGridId().longValue()) {
-            return new Result().error("请选择正确的处理部门");
-        }
-
         // 审核通过
         if (EventIssueItemState.EVENT_REVIEW_PASS == dto.getEventState()) {
             // 事件插入议题表