From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 5ce5fe2..7aa9a1a 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
@@ -38,13 +38,13 @@
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 " +
+ "select nc.*,u.nick_name as userName,u.phone as userPhone from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " +
"<where>"+
- "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
- "circle_id = #{dto.id}"+
+ "<if test='dto.id != null and dto.id!= 0l'>" +
+ "nc.circle_id = #{dto.id}"+
" </if> " +
"</where>"+
" ORDER BY create_at"+
"</script>")
- IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page, DetailNeighborAllCommentByAdminDTO dto);
+ IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page,@Param("dto") DetailNeighborAllCommentByAdminDTO dto);
}
--
Gitblit v1.7.1