From 1f71a273c29432665a93507211e9168e51ac4d3f Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 29 五月 2024 13:59:10 +0800
Subject: [PATCH] 光电查询加入自定义权限修改提交

---
 ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index 249ef50..340c25a 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -57,10 +57,10 @@
         coalesce(asu.password,'') as password,
         coalesce(asu.reserved_1,'') as reserved1,
         coalesce(asu.reserved_2,'') as reserved2 from ard_sy_user asu
-        right join sys_user su on asu.sys_user_id = su.user_id
+        inner join sys_user su on asu.sys_user_id = su.user_id
         <where>
             <if test="sysUserId != null  and sysUserId != ''"> and sys_user_id = #{sysUserId}</if>
-            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="userId != null  and userId != ''"> and asu.user_id = #{userId}</if>
             <if test="password != null  and password != ''"> and password = #{password}</if>
             <if test="reserved1 != null  and reserved1 != ''"> and reserved_1 = #{reserved1}</if>
             <if test="reserved2 != null  and reserved2 != ''"> and reserved_2 = #{reserved2}</if>
@@ -125,11 +125,11 @@
         and su.user_id not in (select asu.sys_user_id from ard_sy_user asu)
     </select>
 
-    <select id="selectArdSyUserByUsersId" resultType="java.util.Map" parameterType="java.lang.Integer" >
-        select asu.id,asu.user_id as userId,asu.password,
-        aus.users_id as usersId,au.name from ard_sy_user asu
-        inner join ard_users_sy aus on asu.id = aus.sy_user_id
-        inner join ard_users au on aus.users_id = au.id
-        where aus.users_id = #{usersId}
-  </select>
+    <select id="userById" parameterType="String" resultMap="ArdSyUserResult">
+        <include refid="selectArdSyUserVo"/>
+        where sys_user_id = #{id}
+    </select>
+    <select id="selectSyUser" resultMap="ArdSyUserResult">
+        select distinct asu.user_id,asu.password from ard_sy_user asu
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3