From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 0873f6c..3838d40 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
@@ -51,7 +51,7 @@
" order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
" </if> " +
"<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 2'>" +
- " order by canc.reply_at desc,canc.create_at desc " +
+ " order by canc.create_at desc " +
" </if> " +
"<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 3'>" +
" order by (canc.views_num + canc.comment_num + canc.fabulous_num) desc " +
@@ -93,9 +93,11 @@
AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);
@Select("<script> " +
- "select id,release_content,release_images,status,create_at,comment_num,fabulous_num,forward_num,views_num,refuse_reason " +
+ "select canc.id,canc.release_content,canc.release_images,canc.status,canc.create_at" +
+ ",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 " +
- " where canc.release_id = #{userId} order by create_at desc" +
+ " left join sys_user as su on su.user_id = canc.release_id " +
+ " where canc.release_id = #{userId} and canc.status != 3 order by create_at desc" +
" </script>")
IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page,@Param("userId") Long userId);
@@ -104,7 +106,7 @@
" from com_act_neighbor_circle_comment_reply as reply" +
" left join sys_user as su on su.user_id = reply.user_id" +
" left join sys_user as su1 on su1.user_id = reply.parent_user_id" +
- " where reply.comment_id = #{commentId}")
+ " where reply.comment_id = #{commentId} and reply.status = 1")
IPage<ComActNeighborCommentReplyAppVO> neighborCommentReplyByApp(Page page, @Param("commentId") Long commentId);
}
--
Gitblit v1.7.1