From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
index 101709b..367ac59 100644
--- a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
@@ -472,6 +472,12 @@
<if test="memberId !=null and memberId !='' and auditStatusCd != null and auditStatusCd !=''">
and cm.audit_status_cd = #{auditStatusCd}
</if>
+ <if test="notInCommunityId != null ">
+ and t.community_id not in
+ <foreach collection="notInCommunityId" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -506,6 +512,12 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="communityIds !=null">
+ and t.community_id in
+ <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -520,8 +532,17 @@
</if>
<if test="memberId !=null and memberId !=''">
and cm.community_id = t.community_id
- and cm.member_id = #{memberId}
- and cm.status_cd = '0'
+ and cm.member_id = #{memberId}
+ and cm.status_cd = '0'
+ </if>
+ <if test="memberId !=null and memberId !='' and auditStatusCd != null and auditStatusCd !=''">
+ and cm.audit_status_cd = #{auditStatusCd}
+ </if>
+ <if test="notInCommunityId != null ">
+ and t.community_id not in
+ <foreach collection="notInCommunityId" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
--
Gitblit v1.8.0