From 0184e0f6522afd48fc24db84967daa82619e72b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Tue, 26 Nov 2019 19:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AEPC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E7=A4=BE=E5=8C=BA=E8=A1=97=E9=81=93?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/events/EpdcEventsDao.xml   |  8 ++++----
 .../src/main/resources/mapper/issue/IssueDao.xml     | 12 ++++++------
 .../src/main/resources/mapper/item/ItemDao.xml       |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index 7926cb7e7..3f2f93a6a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -69,10 +69,10 @@
                 AND temp.grid_id = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND temp.STREET_ID = #{streetId}
+                AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
             </if>
             <if test="communityId != null and communityId != ''">
-                AND temp.COMMUNITY_ID = #{communityId}
+                AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
             </if>
             AND temp.EVENT_STATE = 0
         ORDER BY temp.CREATED_TIME DESC
@@ -95,10 +95,10 @@
                 AND temp.grid_id = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND temp.STREET_ID = #{streetId}
+                AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
             </if>
             <if test="communityId != null and communityId != ''">
-                AND temp.COMMUNITY_ID = #{communityId}
+                AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
             </if>
             AND temp.EVENT_STATE = 2
         ORDER BY
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index a7a6ce210..e7935fa61 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -26,12 +26,12 @@
             <if test="gridId != null and gridId != ''">
                 AND issue.GRID_ID = #{gridId}
             </if>
-            <if test="streetId != null and streetId != ''">
-                AND issue.STREET_ID = #{streetId}
-            </if>
-            <if test="communityId != null and communityId != ''">
-                AND issue.COMMUNITY_ID = #{communityId}
-            </if>
+        <if test="streetId != null and streetId != ''">
+            AND find_in_set(#{streetId},issue.PARENT_DEPT_IDS)
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND find_in_set(#{communityId},issue.PARENT_DEPT_IDS)
+        </if>
         ORDER BY
             issue.CREATED_TIME DESC
     </select>
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 84af8da1c..0ea4775a1 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -407,10 +407,10 @@
                 AND item.GRID_ID = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND item.STREET_ID = #{streetId}
+                AND find_in_set(#{streetId},item.PARENT_DEPT_IDS)
             </if>
             <if test="communityId != null and communityId != ''">
-                AND item.COMMUNITY_ID = #{communityId}
+                AND find_in_set(#{communityId},item.PARENT_DEPT_IDS)
             </if>
         ORDER BY
             item.CREATED_TIME DESC