From 7b2103111d0b9a502af918b73ba013ccba640add Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 28 Apr 2020 16:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/PartymemberBaseInfoDao.xml      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 39e0ee43d4..809493652a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/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