|
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag,
|
|
u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag,
|
|
u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
d.dept_name, d.leader,
|
|
d.dept_name, d.leader,
|
|
- suse.sales_level,suse.org_name,suse.org_code,suse.post_name
|
|
|
|
|
|
+ suse.sales_level,suse.org_name,suse.org_code,suse.post_name,suse.is_customer_manager
|
|
from sys_user u
|
|
from sys_user u
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
left join sys_company c on u.company_id = c.id
|
|
left join sys_company c on u.company_id = c.id
|
|
@@ -120,6 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
and sysUserExt.orgCode != ''">
|
|
and sysUserExt.orgCode != ''">
|
|
AND suse.org_code = #{sysUserExt.orgCode}
|
|
AND suse.org_code = #{sysUserExt.orgCode}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="sysUserExt != null and sysUserExt.orgName !=null
|
|
|
|
+ and sysUserExt.orgName != ''">
|
|
|
|
+ AND suse.org_name like concat('%', #{sysUserExt.orgName}, '%')
|
|
|
|
+ </if>
|
|
<if test="userName != null and userName != ''">
|
|
<if test="userName != null and userName != ''">
|
|
AND u.user_name like concat('%', #{userName}, '%')
|
|
AND u.user_name like concat('%', #{userName}, '%')
|
|
</if>
|
|
</if>
|