From a63ba5a74cf521db20ca399512a8a7f8f69dd688 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 31 Mar 2021 11:23:31 +0800
Subject: [PATCH] =?UTF-8?q?/resi/group/group/getgroupsummarize=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/ResiGroupDao.xml      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 5ccd3cdb7d..760a420020 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -155,7 +155,10 @@
         FROM
             resi_group rg
             LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
-            LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID AND rgm.CUSTOMER_USER_ID =#{userId})
+            LEFT JOIN resi_group_member rgm
+            ON ( rg.id = rgm.RESI_GROUP_ID
+                AND rgm.DEL_FLAG='0'
+                AND rgm.CUSTOMER_USER_ID =#{userId})
         WHERE
             rg.DEL_FLAG = '0'
             AND rgs.DEL_FLAG = '0'
@@ -188,10 +191,9 @@
             rg.*
         FROM
             resi_group rg
-            LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID )
+            LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID AND rgm.DEL_FLAG = '0')
         WHERE
             rg.DEL_FLAG = '0'
-            AND rgm.DEL_FLAG = '0'
             AND rgm.GROUP_LEADER_FLAG = 'leader'
             AND rgm.CUSTOMER_USER_ID = #{userId}
             AND rg.GROUP_NAME = #{groupName}