From 90edbd96c576947debb7cdc7739c05a0c74b2748 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期六, 22 七月 2023 16:17:06 +0800
Subject: [PATCH] 根据carId获取车辆及车辆用户调整
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index a15bc0b..e41ea2c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="cameraPriority" column="camera_priority"/>
+ <result property="rongCloudToken" column="rong_cloud_token"/>
<result property="remark" column="remark"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -64,6 +65,7 @@
u.create_by,
u.create_time,
u.camera_priority,
+ u.rong_cloud_token,
u.remark,
d.dept_id,
d.parent_id,
@@ -85,10 +87,10 @@
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.camera_priority, d.dept_name, d.leader from sys_user
- u
- left join sys_dept d on u.dept_id = d.dept_id
+-- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+-- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.camera_priority,u.rong_cloud_token, d.dept_name, d.leader from sys_user u
+-- left join sys_dept d on u.dept_id = d.dept_id
+ <include refid="selectUserVo"/>
where u.del_flag = '0'
<if test="userId != null and userId != ''">
AND u.user_id = #{userId}
@@ -234,6 +236,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="cameraPriority != null">camera_priority = #{cameraPriority},</if>
+ <if test="rongCloudToken != null">rong_cloud_token = #{rongCloudToken},</if>
update_time = now()
</set>
where user_id = #{userId}
--
Gitblit v1.9.3