From 575e94e9db7e507ecec2441d24a13e9415fd9f03 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 19 五月 2021 19:56:05 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 eee310c..cf1f080 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
@@ -49,6 +49,17 @@
"<if test='pageEldersAuthDTO.authUserName != null'>" +
" AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
" </if> " +
+ "<if test='pageEldersAuthDTO.type == 1 '>" +
+ " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.type == 2 '>" +
+ "<if test='pageEldersAuthDTO.createAtStart != null'>" +
+ " AND ea.create_at <![CDATA[>=]]> #{pageComShopOrderSearchDTO.createAtStart} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
+ " AND ea.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
+ " </if> " +
+ " </if> " +
" </where>" +
" ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order} " +
"</script>")
@@ -91,14 +102,36 @@
" 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.sumitUserId != null'>" +
- " AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
+
+
+ "<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" +
+ " #{id}" +
+ "</foreach>" +
" </if> " +
- "<if test='pageEldersAuthDTO.idCard != null'>" +
- " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
- " </if> " +
- "<if test='pageEldersAuthDTO.authUserName != null'>" +
- " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
+
+ "<if test='pageEldersAuthDTO.ids == null or pageEldersAuthDTO.ids.length==0 '>" +
+ "<if test='pageEldersAuthDTO.sumitUserId != null'>" +
+ " AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.idCard != null'>" +
+ " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.authUserName != null'>" +
+ " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.type == 1 '>" +
+ " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.type == 2 '>" +
+ "<if test='pageEldersAuthDTO.createAtStart != null'>" +
+ " AND ea.create_at <![CDATA[>=]]> #{pageComShopOrderSearchDTO.createAtStart} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
+ " AND ea.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
+ " </if> " +
+ " </if> " +
" </if> " +
" </where>" +
" ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order} " +
--
Gitblit v1.7.1