From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 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..41dceca 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
@@ -32,7 +32,7 @@
 //            " </if> " +
 //            " </where>" +
 //            "</script>")
-    @Select("select type,name,phone,image_url from sys_user where user_id=#{userId}")
+    @Select("select type,name,phone,image_url,nick_name from sys_user where user_id=#{userId}")
     LoginUserInfoVO selectUserByUserId(Long userId);
     @Select("<script> " +
             "select t.* from ("+
@@ -42,6 +42,7 @@
             "d.type,\n" +
             "COUNT( DISTINCT c.id ) commentNum,\n" +
             "u.name userName,\n" +
+            "u.nick_name userNickName,\n" +
             "d.create_at \n" +
             "FROM\n" +
             "com_act_discuss d\n" +
@@ -65,6 +66,7 @@
             "select * from ("+
             "SELECT\n" +
             "u.`name` userName,\n" +
+            "u.nick_name userNickName,\n" +
             "u.phone,\n" +
             "c.`comment`,\n" +
             "c.`parent_id`,\n" +
@@ -96,13 +98,14 @@
             "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" +
             "COUNT( DISTINCT c.id ) commentNum,\n" +
             "COUNT( DISTINCT du.id ) signNum,\n" +
             "if(u.type=1,u.name,a.name) userName,\n" +
+            "if(u.type=1,u.nick_name,a.name) userNickName,\n" +
             "if(du.id is not null,1,0) haveSign,\n" +
             "if(ou.id is not null,1,0) haveVote,\n" +
             "u.image_url,\n" +
@@ -135,6 +138,7 @@
             "select * from ("+
             "SELECT\n" +
             "u.`name` userName,\n" +
+            "u.nick_name userNickName,\n" +
             "u.`image_url`,\n" +
             "u.phone,\n" +
             "c.`comment`,\n" +
@@ -155,19 +159,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() != &quot;&quot;'>" +
-            "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