From 740ea8d300e300eaf9e8dd3c3984ab58eb9c0f76 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Sat, 13 Nov 2021 15:21:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=E7=BB=99=E4=B8=8B=E9=9D=A2=E7=94=A8=E6=88=B7=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/XhpcUserPrivilegeMapper.xml   | 2 +-
 .../src/main/resources/mapper/XhpcOperatorMapper.xml      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/XhpcUserPrivilegeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/XhpcUserPrivilegeMapper.xml
index dc5cbd6b..efabe493 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/XhpcUserPrivilegeMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/XhpcUserPrivilegeMapper.xml
@@ -45,7 +45,7 @@
         JOIN xhpc_charging_station xcs on xcs.operator_id = xo.operator_id
         where xo.del_flag = 0
         <if test="null != operatorIds and '' != operatorIds">
-            and operator_id in
+            and xo.operator_id in
             <foreach collection="operatorIds" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
index 2c23779b..4683ef7c 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
@@ -294,8 +294,8 @@
         xo.contact_phone contactPhone, xo.phone, xo.attribute,`xo`.create_time createTime,`xo`.status,
         CASE WHEN xo.`status` = 0 THEN '正常' else '禁用' end statusName,su.user_id userId,
 		xdb.dict_value attributenName
-		from xhpc_operator `xo`
-        LEFT JOIN sys_user su on su.operator_id = `xo`.operator_id
+		from xhpc_operator xo
+        LEFT JOIN sys_user su on su.operator_id = xo.operator_id
 		LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute
         where xo.del_flag = 0
         <if test="name != null and name != ''">
@@ -313,7 +313,7 @@
         <if test="createTimeEnd != null and createTimeEnd != ''"><!-- 结束时间检索 -->
             AND xo.create_time &lt;= #{createTimeEnd}
         </if>
-        group by su.operator_id
+        group by xo.operator_id
         ORDER BY xo.update_time DESC
     </select>
 
@@ -362,7 +362,7 @@
 		 xo.contact_phone contactPhone,  xo.phone, xo.attribute, xo.duty_paragraph dutyParagraph,
 		xdb.dict_value attributenName
         from xhpc_operator `xo`
-                 LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute
+        LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute
         where xo.del_flag = 0
         ORDER BY xo.create_time DESC
     </select>