From 2b72d20d01ec07cf351d225e4ce769a0bb29a037 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 25 Jan 2021 10:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8A=E6=8A=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8D=E6=9F=A5=E5=B9=B3=E9=98=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/screen/ScreenPublicDataDao.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index f3b6ac2a..f0593d80 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -6,8 +6,8 @@
     <select id="customerAgency" resultType="com.elink.esua.epdc.dto.screen.result.ScreenCustomerAgencyDTO">
         SELECT sd.`id` AS agencyId,
                sd.`name` AS agencyName,
-               sd.`pid` AS pid,
-               sd.`pids` AS pids,
+               if(sd.type_key='street_party',0,sd.`pid` )pid,
+               if(sd.type_key='street_party',0,sd.`pids` )pids,
                CASE WHEN sd2.`name` IS NULL
            AND sd1.`name` IS NULL THEN sd.`name` WHEN sd2.`name` IS NULL THEN CONCAT(sd1.`name`, '-', sd.`name`) ELSE CONCAT(IFNULL(sd2.`name`, ''), '-', IFNULL(sd1.`name`, ''), '-', sd.`name`) END AS allParentNames,
                  '' AS areaMarks,
@@ -20,11 +20,11 @@
           LEFT JOIN `esua_epdc_admin`.`sys_dept` sd1 ON sd1.`id`= sd.`pid`
           LEFT JOIN `esua_epdc_admin`.`sys_dept` sd2 ON sd2.`id`= sd1.`pid`
          WHERE sd.`del_flag`= 0
-           AND sd.`type_key`IN('community_party', 'district_party', 'street_party')
+           AND sd.`type_key`IN('community_party', 'street_party')
            AND sd.`id` NOT IN(
         SELECT t.`dept_id`
           FROM `esua_epdc_admin`.`sys_dept_config` t
-         WHERE t.`del_flag`= 0)
+         WHERE t.`del_flag`= 0);
     </select>
 
     <select id="customerGrid" resultType="com.elink.esua.epdc.dto.screen.result.ScreenCustomerGridDTO">