From a8990150b50fde2e507b9df01d8e0847b2bda81d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 22 八月 2021 19:05:06 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 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..5e9fc8d
--- a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
@@ -140,9 +140,9 @@
         typeCd,t.context,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,act.type_name typeCdName,t.create_time createTime
         from activities t
-        left join activities_type act on t.type_cd = act.type_cd and act.status_cd = '0' and t.community_id = act.community_id
+        left join activities_type act on t.type_cd = act.type_cd and t.community_id = act.community_id
         where 1 =1
-        and t.status_cd= '0'
+        and t.status_cd= '0' and act.status_cd = '0'
         <if test="collectCount !=null and collectCount != ''">
             and t.collect_count= #{collectCount}
         </if>
@@ -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>
@@ -171,10 +169,10 @@
             and t.context= #{context}
         </if>
         <if test="startTime !=null ">
-            and t.start_time= #{startTime}
+            and t.start_time &lt;= #{startTime}
         </if>
         <if test="endTime !=null ">
-            and t.end_time= #{endTime}
+            and t.end_time &gt;= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -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}
@@ -286,10 +281,10 @@
             and t.context= #{context}
         </if>
         <if test="startTime !=null ">
-            and t.start_time= #{startTime}
+            and t.start_time &lt;= #{startTime}
         </if>
         <if test="endTime !=null ">
-            and t.end_time= #{endTime}
+            and t.end_time &gt;= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}

--
Gitblit v1.8.0