Merge remote-tracking branch 'origin/dev_1118' into dev_1118

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

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>

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