|
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
select
|
|
|
u.user_id, u.dept_id, u.nick_name, u.nick_name_en, 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_id,
|
|
|
- d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,company_id
|
|
|
+ d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,u.company_id
|
|
|
from
|
|
|
sys_user u
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
@@ -148,6 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="jobNumber != null and jobNumber != ''">
|
|
|
AND instr(u.job_number,#{jobNumber})
|
|
|
</if>
|
|
|
+ <if test="companyId != null">
|
|
|
+ AND u.company_id = #{companyId}
|
|
|
+ </if>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
</select>
|