From cb574e765ea42dcde15a0766b7f707f2c54a005e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 12 十二月 2023 08:54:49 +0800
Subject: [PATCH] 运营商bug修改

---
 cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml |   30 ++++++++++++++----------------
 1 files changed, 14 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 0fb644e..242206b 100644
--- a/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
@@ -20,22 +20,6 @@
         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
-
-        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,
@@ -44,6 +28,20 @@
         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,
+        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
         where 1=1
         <if test="userName !=null and userName !=''">

--
Gitblit v1.7.1