From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 1a9f4fb..403aa58 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
@@ -109,6 +109,7 @@
             "d.photo_pah, " +
             "d.`discuss_subject`, " +
             "d.type, " +
+            "u.type as userType, " +
             "COUNT( DISTINCT c.id ) commentNum, " +
             "COUNT( DISTINCT du.id ) signNum, " +
             "if(u.type=1,u.name,a.name) userName, " +
@@ -148,6 +149,7 @@
             "u.nick_name userNickName, " +
             "u.`image_url`, " +
             "u.phone, " +
+            "u.type as userType, " +
             "c.`comment`, " +
             "c.`parent_id`, " +
             "c.`is_author`, " +

--
Gitblit v1.7.1