党建园地-推荐小组修改

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 (
-          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.`STATUS` != 'removed'
                       AND rgm.CUSTOMER_USER_ID = #{userId}
+                      AND rgm.RESI_GROUP_ID = rg.ID
                 )
-          and rg.CUSTOMER_ID=#{customerId}
+          AND NOT EXISTS (
-          and rg.GRID_ID=#{gridId}
+                SELECT
-          and rg.STATE ='approved'
+                    rmo.GROUP_ID
-        order by totalMember desc,rgs.TOTAL_TOPICS desc
+                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.CUSTOMER_ID = #{customerId}
+          AND rg.GRID_ID = #{gridId}
+          AND rg.STATE = 'approved'
+        ORDER BY
+            totalMember DESC,
+            rgs.TOTAL_TOPICS DESC
         LIMIT #{pageSize}
     </select>