From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 72f3fae..3f73767 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -50,12 +50,19 @@
"count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
"a.participant_max,\n" +
"a.sign_up_begin,\n" +
- "a.sign_up_end\n" +
+ "a.sign_up_end,\n" +
+ "ca.name as communityName \n" +
"FROM\n" +
"com_act_activity a \n" +
"join sys_user u on a.sponsor_id=u.user_id\n" +
"left join com_act_act_sign s on a.id=s.activity_id \n"+
- " where a.community_id=#{comActActivityVO.communityId}" +
+ "left join com_act ca on a.community_id=ca.community_id \n"+
+ " where 1=1 " +
+
+ "<if test='comActActivityVO.choice == 0 '>" +
+ "AND a.community_id=#{comActActivityVO.communityId}\n" +
+ " </if> " +
+
"<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != ""'>" +
" and a.activity_name like concat(#{comActActivityVO.activityName},'%') \n" +
" </if> " +
--
Gitblit v1.7.1