From d0bba45f8c232b44b4523d7690a55b5ca613673b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 5 Mar 2021 17:50:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index 99c05b8..e881cd2 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -2001,7 +2001,7 @@ select  gr.id as orgId,
                         count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
                         count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
                         count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
-                        count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
+                        0 as groupCreateFlag
                     FROM
                     esua_epdc_analysis.epdc_user_behavior_log behavior
                     LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
@@ -2092,7 +2092,7 @@ select  gr.id as orgId,
                     count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
                     count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
                     count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
-                    count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
+                    0 as groupCreateFlag
                     FROM esua_epdc_analysis.epdc_user_behavior_log behavior
                     LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
                     WHERE  behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
@@ -2174,7 +2174,7 @@ select  gr.id as orgId,
                         count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
                         count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
                         count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
-                        count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
+                        0 as groupCreateFlag
                         FROM esua_epdc_analysis.epdc_user_behavior_log behavior
                         LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
                         WHERE  behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
@@ -2246,7 +2246,7 @@ select  gr.id as orgId,
                     count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
                     count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
                     count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
-                    count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
+                    0 as groupCreateFlag
                     FROM esua_epdc_analysis.epdc_user_behavior_log behavior
                     LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID
                     AND USER.DEL_FLAG = '0'
@@ -2337,7 +2337,7 @@ SELECT gr.id as orgId,
                     SUM( behavior.GROUP_OPPOSE_FLAG = 1  ) AS groupOpposeFlag,
                     SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
                     SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
-                    SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag
+                    0 as groupCreateFlag
                     FROM esua_epdc_analysis.epdc_user_behavior_log behavior
                     GROUP BY USER_ID
                 ) behaviorCount
@@ -2476,7 +2476,7 @@ UNION ALL
                     SUM( behavior.GROUP_OPPOSE_FLAG = 1  ) AS groupOpposeFlag,
                     SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
                     SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
-                    SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag
+                    0 as groupCreateFlag
                     FROM esua_epdc_analysis.epdc_user_behavior_log behavior
                     GROUP BY USER_ID
                 ) behaviorCount
@@ -2617,7 +2617,7 @@ union all
                     SUM( behavior.GROUP_OPPOSE_FLAG = 1  ) AS groupOpposeFlag,
                     SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
                     SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
-                    SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag
+                    0 as groupCreateFlag
                     FROM esua_epdc_analysis.epdc_user_behavior_log behavior
                     GROUP BY USER_ID
                 ) behaviorCount
@@ -2760,7 +2760,7 @@ union all
                     SUM( behavior.GROUP_OPPOSE_FLAG = 1  ) AS groupOpposeFlag,
                     SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
                     SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
-                    SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag
+                    0 as groupCreateFlag
                     FROM esua_epdc_analysis.epdc_user_behavior_log behavior
                     GROUP BY USER_ID
                 ) behaviorCount

From 723b3397eec5927e011083d226e38c9779d6871d Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 8 Mar 2021 10:37:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index e881cd2..8228afa 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/epdc-cloud-analysis-pc/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,
+          case when sd.type_key = 'street_party' then 0 else sd.`pid` end AS pid,
+          case when sd.type_key = 'street_party' then 0 else sd.`pids` end AS 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,
@@ -21,7 +21,7 @@
           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