待审核党员列表接口修改

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@@ -67,14 +67,11 @@
             pcm.id as manualId
         FROM
             partymember_info pi
-            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID )
-            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
+            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID AND pcm.DEL_FLAG = '0'and pcm.AUDIT_STATUS='under_auditting')
+            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID AND pca.del_flag='0')
         WHERE
             pi.DEL_FLAG = '0'
-            AND pcm.DEL_FLAG = '0'
-            AND pca.del_flag='0'
             AND pi.CONFIRM_RESULT = 'auto_confirm_failed'
-            and pcm.AUDIT_STATUS='under_auditting'
             AND pi.EXTRA_ORGANIZATION IS NOT NULL
             AND pi.GRID_ID = #{gridId}
         ORDER BY
@@ -95,10 +92,9 @@
             '' as manualId
         FROM
             partymember_info pi
-            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
+            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID AND pca.del_flag='0')
         WHERE
             pi.DEL_FLAG = '0'
-            AND pca.del_flag='0'
             AND pi.CONFIRM_RESULT ='auto_confirm_failed'
             AND (pi.EXTRA_ORGANIZATION is null or trim(pi.EXTRA_ORGANIZATION)='')
             AND pi.GRID_ID = #{gridId}
@@ -113,14 +109,11 @@
             pcm.id as manualId
         FROM
             partymember_info pi
-            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID )
-            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
+            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID AND pcm.del_flag='0' and pcm.AUDIT_STATUS='rejected')
+            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID AND pca.del_flag='0')
         WHERE
             pi.DEL_FLAG = '0'
-            AND pcm.del_flag='0'
-            AND pca.del_flag='0'
             AND pi.CONFIRM_RESULT ='rejected'
-            and pcm.AUDIT_STATUS='rejected'
             AND pi.EXTRA_ORGANIZATION IS NOT NULL
             AND pi.GRID_ID = #{gridId}
         ORDER BY