From 4669d8d2127b40145256b5a19c793497a7f875e2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 18 May 2020 16:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/service/impl/EpdcEventsServiceImpl.java    | 4 ++++
 .../epdc/modules/issue/service/impl/IssueServiceImpl.java     | 4 ++++
 2 files changed, 8 insertions(+)

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 1ba83e680..0684051c3 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
@@ -229,6 +229,10 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE__BUSINESS_TYPE_EVENT);
         informationFormDTO.setBusinessId(eventsEntity.getId());
 
+        if (!dto.getHandlerDeptId().equals(entity.getGridId())) {
+            return new Result().error("请选择正确的处理部门");
+        }
+
         // 审核通过
         if (EventIssueItemState.EVENT_REVIEW_PASS == dto.getEventState()) {
             // 事件插入议题表
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
index ab1e37300..aef9e6c47 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
@@ -204,6 +204,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         informationFormDTO.setBusinessId(entity.getId());
         informationFormDTO.setRelBusinessContent("议题：" + entity.getIssueContent());
 
+        if (!dto.getHandlerDeptId().equals(entity.getGridId())) {
+            return new Result().error("请选择正确的处理部门");
+        }
+
         // 反馈、关闭
         if (EventIssueItemState.ISSUE_HANDLED_FEEDBACK == dto.getState() || EventIssueItemState.ISSUE_CLOSED == dto.getState()) {
             issueHandleService.insert(handleEntity);