From 233d249818f4f4ed089491942c7aa0f1bc2033d5 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 21 五月 2021 09:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
index 2d5b4b6..790eaa1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
@@ -39,7 +39,13 @@
" ) t " +
" LEFT JOIN com_elders_auth ea ON t.id = ea.id " +
" LEFT JOIN sys_user u ON ea.SUMIT_USER_ID = u.user_id\n" +
+ " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
" <where> " +
+
+ "<if test='pageEldersAuthDTO.communityId != null'>" +
+ " AND ac.community_id = #{pageEldersAuthDTO.communityId} " +
+ " </if> " +
+
"<if test='pageEldersAuthDTO.sumitUserId != null'>" +
" AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
" </if> " +
@@ -103,6 +109,10 @@
" LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
" <where> " +
+ "<if test='pageEldersAuthDTO.communityId != null'>" +
+ " AND ac.community_id = #{pageEldersAuthDTO.communityId} " +
+ " </if> " +
+
"<if test='pageEldersAuthDTO.ids != null and pageEldersAuthDTO.ids.length>0 '>" +
" AND ea.id in " +
"<foreach collection='pageEldersAuthDTO.ids' item='id' index='index' open='(' close=')' separator=',' >\n" +
--
Gitblit v1.7.1