From d6a81e1ee7628069fc05ee4f002e6ac6518460a0 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Tue, 29 Sep 2020 10:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=9A=E5=91=98=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E6=83=85=E5=86=B5=E6=8E=92=E5=BA=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-analysis/pom.xml                                 | 2 +-
 .../resources/mapper/party/PartyCaseDisrtibutionDao.xml     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-analysis/pom.xml b/epdc-cloud-analysis/pom.xml
index abaf8bf..f400f5d 100644
--- a/epdc-cloud-analysis/pom.xml
+++ b/epdc-cloud-analysis/pom.xml
@@ -177,7 +177,7 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip>47.104.85.99</nacos.ip>
+                <nacos.ip>192.168.0.16</nacos.ip>
                 <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
 
                 <deptconfig.disdeptid>1263002886258843649</deptconfig.disdeptid>
diff --git a/epdc-cloud-analysis/src/main/resources/mapper/party/PartyCaseDisrtibutionDao.xml b/epdc-cloud-analysis/src/main/resources/mapper/party/PartyCaseDisrtibutionDao.xml
index 454bd5d..401f7db 100644
--- a/epdc-cloud-analysis/src/main/resources/mapper/party/PartyCaseDisrtibutionDao.xml
+++ b/epdc-cloud-analysis/src/main/resources/mapper/party/PartyCaseDisrtibutionDao.xml
@@ -67,7 +67,11 @@
                         AND s.STREET_ID in <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
                     </otherwise>
                 </choose>
-                <if test="streetId == null or streetId ==''">GROUP BY s.STREET_ID</if>
+                GROUP BY
+                <choose>
+                    <when test="streetId != null and streetId !=''">s.COMMUNITY_ID</when>
+                    <otherwise>s.STREET_ID</otherwise>
+                </choose>
             </when>
             <otherwise>
                 SELECT