From 8a1de073300531ddb816577ec70f550d543a35c2 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 21 五月 2021 09:44:43 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
index 66e1a7c..124386d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -17,11 +17,19 @@
@Mapper
public interface ComActQuestnaireDAO extends BaseMapper<ComActQuestnaireDO> {
@Select("<script> " +
- "SELECT aq.id, aq.title, aq.state, u.name as create_user, aq.join_count, aq.create_at , aq.create_by \n" +
+ "SELECT DISTINCT aq.id, aq.title, aq.state, u.name as create_user, aq.join_count, aq.create_at , aq.create_by \n" +
"FROM \n" +
" com_act_questnaire aq \n" +
" LEFT JOIN sys_user u on aq.create_by = u.user_id \n" +
+ "<if test='pageQuestnaireDTO.userId != null '>\n" + //筛选用户已回答的问卷
+ " LEFT JOIN com_act_questnaire_sub qs ON aq.id = qs.que_Id\n" +
+ " LEFT JOIN com_act_questnaire_answer_content ac ON qs.id = ac.sub_id AND ac.user_id=#{pageQuestnaireDTO.userId} " +
+ " </if> \n" +
" where aq.is_hide=0 " +
+
+ "<if test='pageQuestnaireDTO.userId != null '>\n" + //筛选用户已回答的问卷
+ " AND case when ac.id IS NULL then aq.state=0 ELSE TRUE end " +
+ " </if> \n" +
"<if test='communityId != null and communityId!=0l '>\n" +
" and aq.community_id = #{communityId}\n" +
" </if> " +
--
Gitblit v1.7.1