From cbf825f4e63e77241a11ec90841637991e43940f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 24 七月 2021 18:11:28 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
index 5d95c24..3ce5ca5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -36,10 +36,13 @@
"d.is_topping, " +
"d.publish_at, " +
"d.create_at, " +
+ "cadt.`name` as typeName, " +
+ "cadt.color as typeColor, " +
"ca.name as communityName " +
"FROM " +
"com_act_dyn d " +
"LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id " +
+ "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type " +
"LEFT JOIN com_act ca ON d.community_id = ca.community_id " +
"WHERE 1=1 " +
"<if test='comActDynVO.choice == 0 '>" +
@@ -78,10 +81,12 @@
"d.is_topping, " +
"d.publish_at, " +
"d.create_at, " +
+ "cadt.`name` as typeName, " +
"ca.name as communityName " +
"FROM " +
"com_act_dyn d " +
"LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id " +
+ "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type " +
"LEFT JOIN com_act ca ON d.community_id = ca.community_id " +
"WHERE " +
"d.community_id=#{comActDynVO.communityId} " +
--
Gitblit v1.7.1