From 7de024c335d27f4eb539c2c7bf076a211b53aa7d Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 26 Aug 2022 16:47:19 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/partyOrg/IcPartyActDao.xml   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index 9cc9db71b0..5ca5f6c2b5 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -184,16 +184,19 @@
             AND (join_org_id = #{joinOrgId} or #{joinOrgId} LIKE join_org_path)
             GROUP BY ic_party_act_id
         ) a ON ipa.id = a.IC_PARTY_ACT_ID
+        LEFT JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId}
+        WHERE
+            ipa.del_flag = '0'
         <choose>
-            <when test="signIn == 'signIn'"><!-- 查询已签到时 -->
-                INNER JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId}
+            <when test="signIn == 'signIn'"><!-- 查询已签到的 -->
+                AND sign.ic_party_act_id is NOT NULL
+            </when>
+            <when test="signIn == 'unSignIn'"><!-- 查询未签到的 -->
+                AND sign.ic_party_act_id is NULL
             </when>
-            <otherwise><!-- 查询未签到或无签到查询条件时 -->
-                LEFT JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId}
+            <otherwise><!-- 查询已签到和未签到所有的 -->
             </otherwise>
         </choose>
-        WHERE
-            ipa.del_flag = '0'
         <if test="null != actType and actType != ''">
             AND ipa.act_type = #{actType}
         </if>