From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index ff96ba8..6f5aedd 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -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