From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
index 91fbab1..4f72973 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
@@ -96,7 +96,7 @@
"SELECT\n" +
"d.id,\n" +
"d.vote_title,\n" +
- "d.address,\n" +
+ "if(d.address is null or d.address='null',a.name,d.address )address,\n" +
"d.photo_pah,\n" +
"d.`discuss_subject`,\n" +
"d.type,\n" +
@@ -155,19 +155,18 @@
"AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' )\n" +
" </if> " +
"LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id \n" +
- " <where>" +
+ " where c.discuss_id=#{pageComActDiscussCommentDTO.id} and parent_id=0 " +
"<if test='pageComActDiscussCommentDTO.comment != null and pageComActDiscussCommentDTO.comment.trim() != ""'>" +
- "c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" +
+ " and c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" +
"}, '%' ) \n" +
" </if> " +
- " </where>" +
"GROUP BY\n" +
"c.id\n" +
")t order by t.is_topping desc , t.create_at desc"+
"</script>")
IPage<ComActDiscussCommentVO> pageDiscussCommentApplets(Page page, @Param("pageComActDiscussCommentDTO")PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
- @Select("select name from com_act where community_id=#{communityId}")
+ @Select("select name,address from com_act where community_id=#{communityId}")
ComActVO selectCommunity(Long communityId);
@Select("SELECT \n" +
--
Gitblit v1.7.1