From 2aaa32f860d4f3fbda01eded1b20a7cab9d3a393 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 24 十二月 2025 10:58:20 +0800
Subject: [PATCH] 应付接口
---
system/src/main/resources/mapper/system/SysUserMapper.xml | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/system/src/main/resources/mapper/system/SysUserMapper.xml b/system/src/main/resources/mapper/system/SysUserMapper.xml
index 0856cb2..e67d758 100644
--- a/system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,9 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
+ <result property="isDriver" column="is_driver" />
+ <result property="driverId" column="driver_id" />
+ <result property="driverName" column="driver_name" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -47,18 +50,21 @@
</resultMap>
<sql id="selectUserVo">
- select u.user_id, u.dept_id, u.user_name, 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.create_by, u.create_time, u.remark,
+ select u.user_id, u.dept_id, u.user_name, 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.create_by, u.create_time, u.remark,
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
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.is_driver , u.driver_id,td.driver_name
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
+ left join tms_driver td on td.id = u.driver_id
</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, d.dept_name, d.leader from sys_user u
+ 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, d.dept_name, d.leader, u.is_driver , u.driver_id,td.driver_name from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
+ left join tms_driver td on td.id = u.driver_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
@@ -80,6 +86,12 @@
</if>
<if test="deptId != null and deptId != 0">
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+ </if>
+ <if test="isDriver != null">
+ AND u.is_driver = #{isDriver}
+ </if>
+ <if test="driverName != null and driverName != ''">
+ AND td.driver_name like concat('%', #{driverName}, '%')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
@@ -141,6 +153,10 @@
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
+
+ <select id="checkDriverUnique" parameterType="Integer" resultMap="SysUserResult">
+ select user_id, driver_id from sys_user where driver_id = #{driverId} and del_flag = '0' and is_driver = '0' limit 1
+ </select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
@@ -156,6 +172,8 @@
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
+ <if test="isDriver != null">is_driver,</if>
+ <if test="driverId != null">driver_id,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -170,6 +188,8 @@
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
+ <if test="isDriver != null ">#{isDriver},</if>
+ <if test="driverId != null ">#{driverId},</if>
sysdate()
)
</insert>
@@ -190,6 +210,14 @@
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="driverId != null">driver_id = #{driverId},</if>
+ <if test="isDriver != null">
+ is_driver = #{isDriver},
+ <if test="isDriver == 1">
+ driver_id = NULL,
+ </if>
+ </if>
+
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.8.0