|
|
@@ -240,6 +240,7 @@
|
|
|
LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
|
|
|
</if>
|
|
|
<where>
|
|
|
+ su.lock_flag_ = 0 AND su.del_flag_ = 0
|
|
|
<if test="demissionflag != null and demissionflag == 1">
|
|
|
AND e.demission_date_ IS NOT NULL
|
|
|
</if>
|
|
|
@@ -272,6 +273,7 @@
|
|
|
LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
|
|
|
</if>
|
|
|
<where>
|
|
|
+ su.lock_flag_ = 0 AND su.del_flag_ = 0
|
|
|
<if test="organId != null">
|
|
|
AND INTE_ARRAY(e.organ_id_list_,#{organId})
|
|
|
</if>
|
zouxuan