From 323380dee8b5e1d39be981dbdb4c88cfb658a868 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 28 May 2020 15:39:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E5=B0=8F=E7=BB=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/group/ResiGroupDao.xml   | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 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 5b9c922520..e316a46efd 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
@@ -350,22 +350,36 @@
             resi_group rg
                 LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
         WHERE
-            rg.DEL_FLAG = '0'
+            NOT EXISTS (
+                    SELECT
+                        rgm.RESI_GROUP_ID
+                    FROM
+                        resi_group_member rgm
+                    WHERE
+                        rgm.DEL_FLAG = '0'
+                      AND rgm.`STATUS` != 'removed'
+                      AND rgm.CUSTOMER_USER_ID = #{userId}
+                      AND rgm.RESI_GROUP_ID = rg.ID
+                )
+          AND NOT EXISTS (
+                SELECT
+                    rmo.GROUP_ID
+                FROM
+                    group_memeber_operation rmo
+                WHERE
+                    rmo.DEL_FLAG = '0'
+                  AND rmo.CUSTOMER_USER_ID = #{userId}
+                  AND rmo.OPERATE_STATUS = 'under_auditting'
+                  AND rmo.GROUP_ID = rg.ID
+            )
+          AND rg.DEL_FLAG = '0'
           AND rgs.DEL_FLAG = '0'
-          and rg.id not in (
-            SELECT
-                rgm.RESI_GROUP_ID
-            FROM
-                resi_group_member rgm
-            WHERE
-                rgm.DEL_FLAG = '0'
-              AND rgm.`STATUS` !='removed'
-              AND rgm.CUSTOMER_USER_ID = #{userId}
-        )
-          and rg.CUSTOMER_ID=#{customerId}
-          and rg.GRID_ID=#{gridId}
-          and rg.STATE ='approved'
-        order by totalMember desc,rgs.TOTAL_TOPICS desc
+          AND rg.CUSTOMER_ID = #{customerId}
+          AND rg.GRID_ID = #{gridId}
+          AND rg.STATE = 'approved'
+        ORDER BY
+            totalMember DESC,
+            rgs.TOTAL_TOPICS DESC
         LIMIT #{pageSize}
     </select>