From 70eb051b54b835edb3f93e701e5d07a1d21045e6 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 07 五月 2021 18:15:18 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 1925342..0873f6c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -39,7 +39,9 @@
"canc.last_comment_num," +
"canc.last_fabulous_num," +
"canc.last_views_num," +
+ "canc.type," +
"su.nick_name as name," +
+ "su.community_id," +
"su.image_url as headUrl " +
" FROM " +
" com_act_neighbor_circle AS canc" +
@@ -60,19 +62,18 @@
@Select("<script> " +
"select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content " +
",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num " +
- ",canc.is_boutique,canc.create_at,canc.reply_at from com_act_neighbor_circle as canc " +
+ ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle as canc " +
" left join sys_user as su on su.user_id = canc.release_id where id = #{circleId}"+
" </script>")
ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
@Select("<script> \n"+
"SELECT\n" +
"nc.*,\n" +
- "u.`name` AS releaseName,u.`type` as userType\n" +
- ",ca.name as communityName\n" +
+ "u.`nick_name` AS releaseName,u.`type` as userType\n" +
+ ",u.name as communityName\n" +
"FROM\n" +
"com_act_neighbor_circle nc\n" +
- "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
- "left join com_act ca on u.community_id=ca.community_id \n" +
+ "LEFT JOIN sys_user u ON nc.release_id = u.user_id \n" +
"<where>"+
"nc.community_id = #{neighborCircleAdminDTO.communityId} \n"+
"<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>" +
--
Gitblit v1.7.1