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 - and operator_id in + and xo.operator_id in #{item} 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 @@ -313,7 +313,7 @@ AND xo.create_time <= #{createTimeEnd} - group by su.operator_id + group by xo.operator_id ORDER BY xo.update_time DESC @@ -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