|
|
@@ -390,9 +390,7 @@
|
|
|
select
|
|
|
count(0)
|
|
|
from(select a.id from `user` a
|
|
|
- <if test="name != null">
|
|
|
left join user_names un on a.id=un.uid
|
|
|
- </if>
|
|
|
left join organization_identity b on a.id = b.uid
|
|
|
<if test="departmentId != null and departmentId !=''">
|
|
|
INNER join (select id
|
|
|
@@ -410,7 +408,6 @@
|
|
|
#{name}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
-
|
|
|
</if>
|
|
|
<if test="role == 1 and name != null">
|
|
|
and un.name like concat('%', #{name},'%')
|