From 08f95b2f159b56fa3bd4f4b348855989de8aa456 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 18 十二月 2025 21:48:18 +0800
Subject: [PATCH] feat: vehicle
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index f5fab34..b62ed45 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -28,6 +28,8 @@
<result property="openId" column="open_id" />
<result property="unionId" column="union_id" />
<result property="wechatNickname" column="wechat_nickname" />
+ <result property="qyWechatUserId" column="qy_wechat_user_id" />
+ <result property="qyWechatUpdateTime" column="qy_wechat_update_time" />
<result property="canViewAllConsult" column="can_view_all_consult" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
@@ -53,7 +55,7 @@
</resultMap>
<sql id="selectUserVo">
- select u.user_id, u.dept_id, u.user_name,u.oa_user_id, u.oa_order_class, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.oa_user_id, u.create_by, u.create_time, u.remark,u.open_id,u.union_id,u.wechat_nickname,u.can_view_all_consult,
+ select u.user_id, u.dept_id, u.user_name,u.oa_user_id, u.oa_order_class, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.oa_user_id, u.create_by, u.create_time, u.remark,u.open_id,u.union_id,u.wechat_nickname,u.qy_wechat_user_id,u.qy_wechat_update_time,u.can_view_all_consult,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
@@ -170,7 +172,9 @@
<if test="status != null and status != ''">status,</if>
<if test="oaUserId != null">oa_user_id,</if>
<if test="oaOrderClass != null and oaOrderClass != ''">oa_order_class,</if>
- <if test="canViewAllConsult != null and canViewAllConsult != ''">can_view_all_consult,</if>
+ <if test="canViewAllConsult != null and canViewAllConsult != ''">can_view_all_consult,</if>
+ <if test="qyWechatUserId != null and qyWechatUserId != ''">qy_wechat_user_id,</if>
+ <if test="qyWechatUpdateTime != null">qy_wechat_update_time,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
@@ -188,6 +192,8 @@
<if test="oaUserId != null">#{oaUserId},</if>
<if test="oaOrderClass != null and oaOrderClass != ''">#{oaOrderClass},</if>
<if test="canViewAllConsult != null and canViewAllConsult != ''">#{canViewAllConsult},</if>
+ <if test="qyWechatUserId != null and qyWechatUserId != ''">#{qyWechatUserId},</if>
+ <if test="qyWechatUpdateTime != null">#{qyWechatUpdateTime},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
sysdate()
@@ -208,6 +214,8 @@
<if test="oaUserId != null">oa_user_id = #{oaUserId},</if>
<if test="oaOrderClass != null">oa_order_class = #{oaOrderClass},</if>
<if test="canViewAllConsult != null and canViewAllConsult != ''">can_view_all_consult = #{canViewAllConsult},</if>
+ <if test="qyWechatUserId != null and qyWechatUserId != ''">qy_wechat_user_id = #{qyWechatUserId},</if>
+ <if test="qyWechatUpdateTime != null">qy_wechat_update_time = #{qyWechatUpdateTime},</if>
<if test="openId != null and openId != ''">open_id = #{openId},</if>
<if test="unionId != null and unionId != ''">union_id = #{unionId},</if>
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
@@ -256,6 +264,12 @@
where u.open_id = #{openId} and u.del_flag = '0'
</select>
+ <!-- 閫氳繃浼佷笟寰俊鐢ㄦ埛ID鏌ヨ鐢ㄦ埛 -->
+ <select id="selectUserByQyWechatUserId" parameterType="String" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.qy_wechat_user_id = #{qyWechatUserId} and u.del_flag = '0'
+ </select>
+
<!-- 鏍规嵁鍒嗗叕鍙窱D鍒楄〃鏌ヨ鐢ㄦ埛锛堝寘鍚垎鍏徃鍙婂叾鎵�鏈夊瓙閮ㄩ棬鐨勭敤鎴凤級 -->
<select id="selectUsersByBranchDeptIds" resultMap="SysUserResult">
SELECT DISTINCT
@@ -287,4 +301,19 @@
ORDER BY u.create_time DESC
</select>
-</mapper>
\ No newline at end of file
+ <!-- 鏍规嵁serviceOrderClass鎴杁ispatchOrderClass鏌ヨ鍏锋湁canViewAllConsult鏉冮檺鐨勭敤鎴� -->
+ <select id="selectUsersByOrderClassAndCanViewAllConsult" resultMap="SysUserResult">
+ SELECT DISTINCT
+ u.user_id, u.dept_id, u.user_name, u.nick_name, u.email,
+ u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.create_time,
+ u.can_view_all_consult,u.oa_order_class
+
+ FROM sys_user u
+ WHERE u.del_flag = '0'
+ AND u.status = '0'
+ AND u.can_view_all_consult = '1'
+ AND u.oa_order_class like concat('%', #{orderClass}, '%')
+ ORDER BY u.create_time DESC
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1