|
@@ -100,12 +100,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
where u.del_flag = '0'
|
|
|
<if test="userId != null and userId != 0">
|
|
|
- AND u.user_id = #{userId}
|
|
|
- </if>
|
|
|
- <if test="jobNumber != null and jobNumber != 0">
|
|
|
- AND u.job_number = #{jobNumber}
|
|
|
- </if>
|
|
|
- <if test="userName != null and userName != ''">
|
|
|
+ AND u.user_id = #{userId}
|
|
|
+ </if>
|
|
|
+ <if test="jobNumber != null and jobNumber != 0">
|
|
|
+ AND u.job_number = #{jobNumber}
|
|
|
+ </if>
|
|
|
+ <if test="userName != null and userName != ''">
|
|
|
AND u.user_name like concat('%', #{userName}, '%')
|
|
|
</if>
|
|
|
<if test="status != null and status != ''">
|
|
@@ -129,10 +129,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<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>
|
|
|
-
|
|
|
- ${params.dataScope}
|
|
|
- </select>
|
|
|
+ </if>
|
|
|
+
|
|
|
+ ${params.dataScope}
|
|
|
+ </select>
|
|
|
|
|
|
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
|