From 15d3711a5321e9a5c38b66320ca6bff5b96a3b50 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 18 九月 2021 16:00:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java |   56 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
index b9e917a..729aa49 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
@@ -31,31 +31,37 @@
 //            " </if> " +
 //            " </where>" +
 //            "</script>")
-    @Select("" +
-            "SELECT\n" +
-            "u.`name` userName,\n" +
-            "IFNULL(u.`nick_name`,'社区管理员') as userNickName,\n" +
-            "u.`image_url`,\n" +
-            "u.phone,\n" +
-            "c.`comment`,\n" +
-            "c.`parent_id`,\n" +
-            "c.`is_author`,\n" +
-            "c.`is_topping`,\n" +
-            "COUNT( cu.id ) num,\n" +
-            "c.create_at,\n" +
-            "c.id \n" +
-            "FROM\n" +
-            "com_act_discuss_comment c\n" +
-            "JOIN sys_user u ON c.user_id = u.user_id\n" +
-            "LEFT JOIN com_act_discuss_comment_user cu on c.id=cu.disscuss_comment_id\n" +
-            "WHERE\n" +
-            "FIND_IN_SET(\n" +
-            "\tc.id,\n" +
-            "getChildren ( #{id} )) and c.parent_id !=0 \n" +
-            "GROUP BY c.id\n" +
-            "ORDER BY\n" +
-            "create_at desc")
-    List<ComActDiscussCommentVO> selectChilds(Long id);
+//    @Select("" +
+//            "SELECT\n" +
+//            "u.`name` userName,\n" +
+//            "IFNULL(u.`nick_name`,'社区管理员') as userNickName,\n" +
+//            "u.`image_url`,\n" +
+//            "u.phone,\n" +
+//            "c.`comment`,\n" +
+//            "c.`parent_id`,\n" +
+//            "c.`is_author`,\n" +
+//            "c.`is_topping`,\n" +
+//            "COUNT( cu.id ) num,\n" +
+//            "c.create_at,\n" +
+//            "c.id \n" +
+//            "FROM\n" +
+//            "com_act_discuss_comment c\n" +
+//            "JOIN sys_user u ON c.user_id = u.user_id\n" +
+//            "LEFT JOIN com_act_discuss_comment_user cu on c.id=cu.disscuss_comment_id\n" +
+//            "WHERE\n" +
+//            "FIND_IN_SET(\n" +
+//            "\tc.id,\n" +
+//            "getChildren ( #{id} )) and c.parent_id !=0 \n" +
+//            "GROUP BY c.id\n" +
+//            "ORDER BY\n" +
+//            "create_at desc")
+
+    /**
+     * 获取子评论
+     * @param parentId
+     * @return
+     */
+    List<ComActDiscussCommentVO> selectChilds(@Param("parentId") Long parentId);
 
     /**
      * 该评论下所有回复内容

--
Gitblit v1.7.1