From 1d81408cf4fc6a6f42e7d348817827b433fbc0b7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 26 Oct 2020 17:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=88=86=E5=B8=83=EF=BC=8C=E5=85=9A?=
 =?UTF-8?q?=E5=91=98=E5=88=86=E5=B8=83=20=E8=B0=83=E6=95=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=99=BA=E6=85=A7=E7=A4=BE=E5=8C=BA=E8=A6=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/screen/DistributionController.java  |  6 +++---
 .../mapper/screen/ScreenCustomerAgencyDao.xml      |  4 ++--
 .../mapper/screen/ScreenCustomerGridDao.xml        | 14 ++++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
index 7074ed33d8..25bf9e5434 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
+++ b/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 上午
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 9007350e5c..f16395c129 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/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
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index b17fe0f6a8..c072214600 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/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,
-            grid_name AS gridName,
-            party_mark AS partyMark
+            scg.grid_id AS gridId,
+            scg.grid_name AS gridName,
+            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
-            AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
+            scg.del_flag = 0
+            AND bo.BIZ_TYPE = 'community'
+            AND scg.all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 
     <!-- 查询子级用户分布【网格级别】 -->