bug修改

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'"><!-- 查询已签到时 -->
+            <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}
+                AND sign.ic_party_act_id is NOT NULL
+            </when>
+            <when test="signIn == 'unSignIn'"><!-- 查询未签到的 -->
+                AND sign.ic_party_act_id is NULL
             </when>
-            <otherwise><!-- 查询未签到或无签到查询条件时 -->
+            <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>
         </choose>
-        WHERE
-            ipa.del_flag = '0'
         <if test="null != actType and actType != ''">
             AND ipa.act_type = #{actType}
         </if>