From 1859ea0a7a1eead549f39d4216a9a0d9ec757fb2 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 13 四月 2021 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 2 ++
1 files changed, 2 insertions(+), 0 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 3f73767..6a27818 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
@@ -91,6 +91,7 @@
@Select("SELECT \n" +
"u.name sponsorName,\n" +
+ "ca.name communityName,\n" +
"count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
"count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
"a.* \n" +
@@ -98,6 +99,7 @@
"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"+
+ "left join com_act ca on a.community_id=ca.community_id \n"+
"where a.id=#{id} \n"+
" group by a.id "
)
--
Gitblit v1.7.1