Commit f9759b6a authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 2e21fada e415343f
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<select id="cspDeptUserList" resultType="com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysDeptVo"> <select id="cspDeptUserList" resultType="com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysDeptVo">
select d.dept_id, d.name, d.parent_id,d.ancestors,sort_order, select d.dept_id, d.name, d.parent_id,d.ancestors,sort_order,
(select count(*) from sys_user_dept_permission where dept_id = d.dept_id) as peoplenum (select count(r.id) from sys_user_dept_permission r left join sys_user u on u.user_id = r.user_id where r.dept_id = d.dept_id and u.del_flag = '0') as peoplenum
from sys_dept d from sys_dept d
where d.del_flag = '0' where d.del_flag = '0'
<if test="dept.projectNo != null and dept.projectNo != ''"> <if test="dept.projectNo != null and dept.projectNo != ''">
......
...@@ -425,7 +425,7 @@ ...@@ -425,7 +425,7 @@
LEFT JOIN sys_user_dept_permission p on u.user_id=p.user_id LEFT JOIN sys_user_dept_permission p on u.user_id=p.user_id
LEFT JOIN sys_dept d on d.dept_id=p.dept_id LEFT JOIN sys_dept d on d.dept_id=p.dept_id
where where
1=1 and u.del_flag = '0' and u.lock_flag = '0' 1=1 and u.del_flag = '0'
<if test="nickName != null and nickName != ''"> <if test="nickName != null and nickName != ''">
and u.nickname LIKE CONCAT('%',#{nickName},'%') and u.nickname LIKE CONCAT('%',#{nickName},'%')
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment