From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 8d7d137..dcaff26 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
@@ -114,8 +114,10 @@
"COUNT( DISTINCT du.id ) signNum, " +
"if(u.type=1,u.name,a.name) userName, " +
"if(u.type=1,u.nick_name,a.name) userNickName, " +
+ "<if test='pageComActDiscussDTO.loginUserId != null '>" +
"if(du.id is not null,1,0) haveSign, " +
"if(ou.id is not null,1,0) haveVote, " +
+ " </if> " +
"u.image_url, " +
"d.create_at " +
"FROM " +
@@ -123,9 +125,11 @@
"JOIN sys_user u ON d.user_id = u.user_id " +
"JOIN com_act a ON d.community_id = a.community_id " +
"LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id " +
- "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id " +
"LEFT JOIN com_act_discuss_option do ON d.id = do.discuss_id " +
+ "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id " +
+ "<if test='pageComActDiscussDTO.loginUserId != null '>" +
"LEFT JOIN com_act_discuss_option_user ou on do.id=ou.discuss_option_id and ou.user_id=#{pageComActDiscussDTO.loginUserId} " +
+ " </if> " +
" where d.community_id=#{pageComActDiscussDTO.communityId}" +
"<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != ""'>" +
" and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) " +
--
Gitblit v1.7.1