From 39004678a36c17fcea0674b54675a76c2d3b0528 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 19 四月 2024 16:29:39 +0800
Subject: [PATCH] 增加雷达报警和视频巡检引导类型上报
---
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index f248c3e..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>
@@ -124,4 +124,12 @@
select * from sys_user su where su.del_flag = '0'
and su.user_id not in (select asu.sys_user_id from ard_sy_user asu)
</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