From 7f21d4f22ec711d6aa89900b07e0b5ac31dbac42 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 25 八月 2023 17:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index 75fab74..6f5aedd 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -13,6 +13,28 @@
<result property="reserved2" column="reserved_2" />
</resultMap>
+ <resultMap type="SysUser" id="SysUserResult">
+ <id property="userId" column="user_id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="userName" column="user_name"/>
+ <result property="nickName" column="nick_name"/>
+ <result property="email" column="email"/>
+ <result property="phonenumber" column="phonenumber"/>
+ <result property="sex" column="sex"/>
+ <result property="avatar" column="avatar"/>
+ <result property="password" column="password"/>
+ <result property="status" column="status"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="loginIp" column="login_ip"/>
+ <result property="loginDate" column="login_date"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="cameraPriority" column="camera_priority"/>
+ <result property="remark" column="remark"/>
+ </resultMap>
+
<sql id="selectArdSyUserVo">
select id, sys_user_id, user_id, password, reserved_1, reserved_2 from ard_sy_user
</sql>
@@ -42,6 +64,7 @@
<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>
+ and su.del_flag = '0'
</where>
</select>
@@ -96,4 +119,17 @@
<select id="getArdSyUserAll" resultMap="ArdSyUserResult">
select * from ard_sy_user
</select>
+
+ <select id="getSysUserNoSY" resultMap="SysUserResult">
+ 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