From 9e9a50ca73be91ea5595e809dbd863a0a885f44a Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 10 Feb 2020 23:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E3=80=81=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/issue/IssueDao.xml   | 18 ++++++------------
 .../main/resources/mapper/topic/TopicDao.xml   | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml
index b97d7f438..05e9c3770 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -23,16 +23,13 @@
             AND ei.ISSUE_CONTENT LIKE CONCAT('%',#{issueContent},'%')
         </if>
         <if test="streetId != null and streetId != ''">
-            AND (find_in_set(#{streetId},ei.PARENT_DEPT_IDS)
-            OR find_in_set(#{streetId},ei.ALL_DEPT_IDS))
+            AND find_in_set(#{streetId},ei.ALL_DEPT_IDS)
         </if>
         <if test="communityId != null and communityId != ''">
-            AND (find_in_set(#{communityId},ei.PARENT_DEPT_IDS)
-            OR find_in_set(#{communityId},ei.ALL_DEPT_IDS))
+            AND find_in_set(#{communityId},ei.ALL_DEPT_IDS)
         </if>
         <if test="gridId != null and gridId != ''">
-            AND (ei.GRID_ID = #{gridId}
-            OR find_in_set(#{gridId},ei.ALL_DEPT_IDS))
+            AND ei.GRID_ID = #{gridId}
         </if>
         <if test="startTime != null and startTime != ''">
             and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &gt;=#{startTime}
@@ -74,16 +71,13 @@
             AND ei.ISSUE_CONTENT LIKE CONCAT('%',#{issueContent},'%')
         </if>
         <if test="streetId != null and streetId != ''">
-            AND (find_in_set(#{streetId},ei.PARENT_DEPT_IDS)
-            OR find_in_set(#{streetId},ei.ALL_DEPT_IDS))
+            AND find_in_set(#{streetId},ei.ALL_DEPT_IDS)
         </if>
         <if test="communityId != null and communityId != ''">
-            AND (find_in_set(#{communityId},ei.PARENT_DEPT_IDS)
-            OR find_in_set(#{communityId},ei.ALL_DEPT_IDS))
+            AND find_in_set(#{communityId},ei.ALL_DEPT_IDS)
         </if>
         <if test="gridId != null and gridId != ''">
-            AND (ei.GRID_ID = #{gridId}
-            OR find_in_set(#{gridId},ei.ALL_DEPT_IDS))
+            AND ei.GRID_ID = #{gridId}
         </if>
         <if test="startTime != null and startTime != ''">
             and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &gt;=#{startTime}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml
index a21b690ba..e5c4ee084 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -22,16 +22,13 @@
            and et.TOPIC_CONTENT like concat('%', #{topicContent}, '%')
         </if>
         <if test="streetId != null and streetId != ''">
-            AND (find_in_set(#{streetId},et.PARENT_DEPT_IDS)
-            OR find_in_set(#{streetId},et.ALL_DEPT_IDS))
+            AND find_in_set(#{streetId},et.ALL_DEPT_IDS)
         </if>
         <if test="communityId != null and communityId != ''">
-            AND (find_in_set(#{communityId},et.PARENT_DEPT_IDS)
-            OR find_in_set(#{communityId},et.ALL_DEPT_IDS))
+            AND find_in_set(#{communityId},et.ALL_DEPT_IDS)
         </if>
         <if test="gridId != null and gridId != ''">
-            AND (et.GRID_ID = #{gridId}
-            OR find_in_set(#{gridId},et.ALL_DEPT_IDS))
+            AND et.GRID_ID = #{gridId}
         </if>
         <if test="startTime != null and startTime != ''">
             and DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d' ) &gt;=#{startTime}
@@ -68,16 +65,13 @@
             and et.TOPIC_CONTENT like concat('%', #{topicContent}, '%')
         </if>
         <if test="streetId != null and streetId != ''">
-            AND (find_in_set(#{streetId},et.PARENT_DEPT_IDS)
-            OR find_in_set(#{streetId},et.ALL_DEPT_IDS))
+            AND find_in_set(#{streetId},et.ALL_DEPT_IDS)
         </if>
         <if test="communityId != null and communityId != ''">
-            AND (find_in_set(#{communityId},et.PARENT_DEPT_IDS)
-            OR find_in_set(#{communityId},et.ALL_DEPT_IDS))
+            AND find_in_set(#{communityId},et.ALL_DEPT_IDS)
         </if>
         <if test="gridId != null and gridId != ''">
-            AND (et.GRID_ID = #{gridId}
-            OR find_in_set(#{gridId},et.ALL_DEPT_IDS))
+            AND et.GRID_ID = #{gridId}
         </if>
         <if test="startTime != null and startTime != ''">
             and DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d' ) &gt;=#{startTime}