From b6169fae531465dc60f3b5c8f841eb2dd7009eec Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 四月 2021 14:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
index 9862163..56bf597 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
@@ -33,14 +33,14 @@
List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);
@Select("<script> " +
- "select cr.*,u.name as userName from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id " +
+ "select cr.*,u.name as userName,u.phone as userPhone,u.nick_name as userNickName from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id " +
"<where>"+
- "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
- "comment_id = #{dto.id}"+
+ "<if test='dto.id != null and dto.id!= 0l'>" +
+ "cr.comment_id = #{dto.id}"+
" </if> " +
"</where>"+
- " ORDER BY create_at"+
+ " ORDER BY cr.create_at"+
"</script>")
- Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page<ComActNeighborCircleCommentReplyDO> page, DetailNeighborCommentReplyByAdminDTO dto);
+ Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page page,@Param("dto") DetailNeighborCommentReplyByAdminDTO dto);
}
--
Gitblit v1.7.1