From 2ca3790caf8f27c408e658ba5e5f0d4d3ca45f91 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 4 Aug 2020 13:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3=E3=80=91=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08-04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/service/impl/EpdcEventsServiceImpl.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index aa00092a3..47672cfa4 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/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()) {
             // 事件插入议题表