|
|
@@ -342,6 +342,9 @@
|
|
|
<if test="aid != null and aid !=''">
|
|
|
and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test="departmentId != null and departmentId !=''">
|
|
|
+ and d.department_id=#{departmentId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<if test="name != null and name != ''">
|
|
|
and a.identify_name like concat('%',#{name},'%')
|
|
|
</if>
|
|
|
@@ -369,10 +372,16 @@
|
|
|
count(0)
|
|
|
from user a
|
|
|
left join organization_identity b on a.id = b.uid
|
|
|
+ <if test="departmentId != null and departmentId !=''">
|
|
|
+ left join (select id
|
|
|
+ from admin
|
|
|
+ where department_id=#{departmentId,jdbcType=VARCHAR}) d on a.aid = d.id
|
|
|
+ </if>
|
|
|
where a.type = 1 and a.status != 1
|
|
|
<if test="aid != null and aid !=''">
|
|
|
and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+
|
|
|
<if test="name != null and name != ''">
|
|
|
and a.identify_name like concat('%',#{name},'%')
|
|
|
</if>
|