From 321ebdf330ad299e87132cc51a6c3affe3f51e4d Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 10 九月 2021 11:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 4200c9b..a6c0b7f 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
@@ -38,10 +38,10 @@
IPage<ComActNeighborCircleAppVO> pageNeighborByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);
@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,canct.name as topicName "
+ + ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canct.name as topicName,canc.refuse_reason "
+ ",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 "
- + " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id where canc.id = #{circleId}"
+ + " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id where canc.id = #{circleId} and canc.is_del = 2"
+ " </script>")
ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
@@ -55,7 +55,7 @@
+ ",canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canc.refuse_reason,su.nick_name as name,su.image_url as headUrl "
+ " from com_act_neighbor_circle as canc " + " left join sys_user as su on su.user_id = canc.release_id "
+ " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id "
- + " where canc.release_id = #{userId} and canc.status != 3 order by create_at desc" + " </script>")
+ + " where canc.release_id = #{userId} and canc.is_del = 2 and canc.status != 3 order by create_at desc" + " </script>")
IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page, @Param("userId") Long userId);
@Select("select reply.id,reply.comment_id,reply.reply_content,reply.fabulous_num,reply.create_at"
--
Gitblit v1.7.1