From 44f9cd5c403584c39c8bb893f69244e4835daab8 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
index aa52be1..a6f25e4 100644
--- a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
@@ -319,6 +319,9 @@
<if test="memberId != null and memberId != '' and needCommunityInfo == false">
and ms.member_id = #{memberId}
</if>
+ <if test="subMemberId != null and subMemberId != ''">
+ and ms.member_id = #{memberId}
+ </if>
<if test="noAuditEnterCommunity == true">
and ms.member_type_cd not in ('390001200003','390001200005','390001200000')
</if>
@@ -332,6 +335,10 @@
<if test="communityId != null and communityId != ''">
and ms.community_id = #{communityId}
</if>
+ <if test="communityName != null and communityName != '' and needCommunityInfo == true">
+ and sc.name like concat('%',#{communityName},'%')
+ </if>
+ order by ms.create_time desc
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
@@ -388,6 +395,10 @@
and ms.member_id = #{memberId}
</if>
+ <if test="subMemberId != null and subMemberId != ''">
+ and ms.member_id = #{memberId}
+ </if>
+
<if test="noAuditEnterCommunity == true">
and ms.member_type_cd not in ('390001200003','390001200005','390001200000')
</if>
@@ -399,8 +410,17 @@
and ms.audit_status_cd = #{auditStatusCd}
</if>
+ <if test="auditStatusCds != null and auditStatusCds != null">
+ and ms.audit_status_cd in
+ <foreach collection="auditStatusCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="communityId != null and communityId != ''">
and ms.community_id = #{communityId}
+ </if>
+ <if test="communityName != null and communityName != '' and needCommunityInfo == true">
+ and sc.name like concat('%',#{communityName},'%')
</if>
</select>
@@ -432,13 +452,19 @@
and t.city_code= #{cityCode}
</if>
<if test="name !=null and name != ''">
- and t.name= #{name}
+ and t.name like concat('%',#{name},'%')
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
<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}
@@ -456,6 +482,15 @@
and cm.community_id = t.community_id
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>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -483,13 +518,19 @@
and t.city_code= #{cityCode}
</if>
<if test="name !=null and name != ''">
- and t.name= #{name}
+ and t.name like concat('%',#{name},'%')
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
<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}
@@ -505,8 +546,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