From 17935dcdfa3d85c48d99f4065ed5ac1bd7bd2c7b Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期四, 29 四月 2021 14:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
index 1f28aef..5ce5fe2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
@@ -24,9 +27,15 @@
",cancc.create_at,cancc.is_release,su.nick_name as userName,su.image_url as userHeadUrl " +
" from com_act_neighbor_circle_comment as cancc " +
" left join sys_user as su on su.user_id = cancc.user_id" +
- " where cancc.circle_id = #{circleId} order by cancc.create_at desc" +
+ " where cancc.circle_id = #{neighborCircleAppDTO.circleId} and cancc.status = 1" +
+ "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 1'>" +
+ " order by cancc.create_at desc" +
+ " </if> " +
+ "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 2'>" +
+ " order by cancc.create_at asc" +
+ " </if> " +
" </script>")
- IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("circleId") Long circleId);
+ IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
@Select("<script> " +
"select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " +
--
Gitblit v1.7.1