|
@@ -246,7 +246,7 @@
|
|
|
LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
|
|
LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
|
|
|
</if>
|
|
</if>
|
|
|
<where>
|
|
<where>
|
|
|
- su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
|
|
|
|
|
|
|
+ su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
|
|
|
<if test="lockFlag != null">
|
|
<if test="lockFlag != null">
|
|
|
AND su.lock_flag_ = #{lockFlag}
|
|
AND su.lock_flag_ = #{lockFlag}
|
|
|
</if>
|
|
</if>
|
|
@@ -282,7 +282,7 @@
|
|
|
LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
|
|
LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
|
|
|
</if>
|
|
</if>
|
|
|
<where>
|
|
<where>
|
|
|
- su.lock_flag_ = 0 AND su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
|
|
|
|
|
|
|
+ su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
|
|
|
<if test="organId != null">
|
|
<if test="organId != null">
|
|
|
AND INTE_ARRAY(e.organ_id_list_,#{organId})
|
|
AND INTE_ARRAY(e.organ_id_list_,#{organId})
|
|
|
</if>
|
|
</if>
|
yanite