From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14: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/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