党支部、事件sql修改，党员分布、用户分布隐藏字段areaMarks

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java

@@ -29,6 +29,7 @@ public class ParymemberResultDTO implements Serializable {
     /**
      * 当前所选组织的坐标区域
      */
+    @JsonIgnore
     private String areaMarks = "";
 
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java

@@ -29,6 +29,7 @@ public class UserResultDTO implements Serializable {
     /**
      * 当前所选组织的坐标区域
      */
+    @JsonIgnore
     private String areaMarks = "";
 
     /**

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -29,6 +29,7 @@
         WHERE
             del_flag = 0
             AND parent_agency_id = #{agencyId}
+            AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 
     <!-- 查询子级用户分布【网格级别】 -->

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml

@@ -32,5 +32,6 @@
         WHERE
             del_flag = '0'
             AND event_id = #{projectId}
+            AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 </mapper>