From 78a900b916f9007e45d45355d6e1de21eb71147e Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期四, 29 四月 2021 13:45:45 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 11 +++++++++--
1 files changed, 9 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 8b44b9c..f017440 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,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.service_community.model.dos.ComActNeighborCircleCommentDO;
@@ -24,8 +25,14 @@
",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);
}
--
Gitblit v1.7.1