From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index e50ca10..590707b
--- a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
@@ -155,12 +155,10 @@
<if test="readCount !=null and readCount != ''">
and t.read_count= #{readCount}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
+ <if test="staffName !=null and staffName != ''">
+ and t.user_name= #{staffName}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
+
<if test="activitiesId !=null and activitiesId != ''">
and t.activities_id= #{activitiesId}
</if>
@@ -270,11 +268,8 @@
<if test="readCount !=null and readCount != ''">
and t.read_count= #{readCount}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
- </if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffName !=null and staffName != ''">
+ and t.user_name= #{staffName}
</if>
<if test="activitiesId !=null and activitiesId != ''">
and t.activities_id= #{activitiesId}
--
Gitblit v1.8.0