From 8a5b6dedd18a0956ffa8da7ec9ace30b1d8238fc Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 16 八月 2025 18:05:07 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml b/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml index 242206b..79aa256 100644 --- a/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml +++ b/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml @@ -20,20 +20,6 @@ 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.alipay AS platform, t3.alipayProportion AS proportion, t3.alipayNum AS number, @@ -56,10 +42,10 @@ <if test="platform !=null and platform !='' and platform==2"> and t1.platform = "支付宝" </if> - <if test="type !=null and type !='' "> + <if test="type !=null "> and t1.type = #{type} </if> - <if test="state !=null and state !=''"> + <if test="state !=null "> and t1.audit = #{state} </if> ORDER BY t1.id; -- Gitblit v1.7.1