From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml | 91 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml b/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
index ac4c105..ce5f4a2 100644
--- a/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
@@ -5,47 +5,64 @@
<select id="listAll" resultType="com.dsh.guns.modular.system.model.OperatorUserVO">
SELECT t1.id AS id,
- t1.operatorId,
- t1.operatorName,
- t1.userName,
- t1.phone,
- t1.platform,
- t1.proportion,
- t1.number,
- t1.audit,
- t1.type
-FROM (
- SELECT t3.id,
- t1.id AS operatorId,
- t1.name AS operatorName,
- t2.name AS userName,
- t2.phone,
- t3.alipay AS platform,
- t3.alipayProportion AS proportion,
- t3.alipayNum AS number,
- t3.alipayAudit AS audit,
- t3.alipayType AS type
- FROM t_operator_user t3
+ t1.operatorId,
+ t1.operatorName,
+ t1.userName,
+ t1.phone,
+ t1.platform,
+ t1.proportion,
+ t1.number,
+ t1.audit,
+ t1.type
+ FROM (
+ SELECT t3.id,
+ t1.id AS operatorId,
+ t1.name AS operatorName,
+ t2.name AS userName,
+ t2.phone,
+ t3.wechat AS platform,
+ t3.wechatProportion AS proportion,
+ t3.wechatNum AS number,
+ t3.wechatAudit AS audit,
+ t3.wechatType AS type
+ FROM t_operator_user t3
LEFT JOIN t_operator t1 ON t3.operatorId = t1.id
LEFT JOIN sys_user t2 ON t1.userId = t2.id AND t2.objectType = 2
-
- UNION ALL
-
- SELECT t3.id,
- t1.id AS operatorId,
- t1.name AS operatorName,
- t2.name AS userName,
- t2.phone,
- t3.wechat AS platform,
- t3.wechatProportion AS proportion,
- t3.wechatNum AS number,
- t3.wechatAudit AS audit,
- t3.wechatType AS type
- FROM t_operator_user t3
+ UNION ALL
+ SELECT t3.id,
+ t1.id AS operatorId,
+ t1.name AS operatorName,
+ t2.name AS userName,
+ t2.phone,
+ t3.alipay AS platform,
+ t3.alipayProportion AS proportion,
+ t3.alipayNum AS number,
+ t3.alipayAudit AS audit,
+ t3.alipayType AS type
+ FROM t_operator_user t3
LEFT JOIN t_operator t1 ON t3.operatorId = t1.id
LEFT JOIN sys_user t2 ON t1.userId = t2.id AND t2.objectType = 2
-) AS t1
-ORDER BY t1.id;
+ ) AS t1
+ where 1=1
+ <if test="userName !=null and userName !=''">
+ and t1.userName like concat("%",#{userName},"%")
+ </if>
+ <if test="phone !=null and phone !=''">
+ and t1.phone like concat("%",#{phone},"%")
+ </if>
+ <if test="platform !=null and platform !='' and platform==1">
+ and t1.platform = "微信"
+ </if>
+ <if test="platform !=null and platform !='' and platform==2">
+ and t1.platform = "支付宝"
+ </if>
+ <if test="type !=null ">
+ and t1.type = #{type}
+ </if>
+ <if test="state !=null ">
+ and t1.audit = #{state}
+ </if>
+ ORDER BY t1.id;
</select>
</mapper>
--
Gitblit v1.7.1