党支部分布，用户分布，党员分布 调整显示智慧社区要显示的

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java

@@ -28,7 +28,7 @@ public class DistributionController {
 
     /**
      * @param formDTO
-     * @Description 1、党支部分布
+     * @Description 1、党支部分布  【只显示 screen_customer_biz_org 表中存在的orgId的数据】
      * @author zxc
      * @date 2020/8/18 10:59 上午
      */
@@ -39,7 +39,7 @@ public class DistributionController {
     }
 
     /**
-     * @Description  2、用户分布
+     * @Description  2、用户分布  【只显示 screen_customer_biz_org 表中存在的orgId的数据】
      * @param userFormDTO
      * @author zxc
      * @date 2020/8/18 11:10 上午
@@ -51,7 +51,7 @@ public class DistributionController {
     }
 
     /**
-     * @Description  3、党员分布
+     * @Description  3、党员分布  【只显示 screen_customer_biz_org 表中存在的orgId的数据】
      * @param parymemberFormDTO
      * @author zxc
      * @date 2020/8/18 11:20 上午

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

@@ -80,7 +80,7 @@
             sutd.org_type AS type
         FROM
             screen_user_total_data sutd
-            LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id
+            LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id AND sca.is_display = 1
         WHERE
             sutd.del_flag = '0'
             AND sca.del_flag = 0
@@ -98,7 +98,7 @@
             sutd.org_type AS type
         FROM
             screen_user_total_data sutd
-            LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id
+            LEFT JOIN screen_customer_agency sca ON sca.agency_id = sutd.org_id AND sca.is_display = 1
         WHERE
             sutd.del_flag = '0'
             AND sca.del_flag = 0

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

@@ -21,14 +21,16 @@
     <!-- 查询党支部信息 -->
     <select id="selectBranch" resultType="com.epmet.evaluationindex.screen.dto.result.BranchResultDTO">
         SELECT
-            grid_id AS gridId,
+            scg.grid_id AS gridId,
-            grid_name AS gridName,
+            scg.grid_name AS gridName,
-            party_mark AS partyMark
+            scg.party_mark AS partyMark
         FROM
-            screen_customer_grid
+            screen_customer_grid scg
+            LEFT JOIN screen_customer_biz_org bo ON bo.ORG_ID = scg.PARENT_AGENCY_ID
         WHERE
-            del_flag = 0
+            scg.del_flag = 0
-            AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
+            AND bo.BIZ_TYPE = 'community'
+            AND scg.all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 
     <!-- 查询子级用户分布【网格级别】 -->