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 | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
index 367ac59..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>
@@ -408,6 +419,9 @@
<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>
<!-- 鏌ヨ灏忓尯淇℃伅 add by wuxw 2018-07-03 -->
--
Gitblit v1.8.0