|
@@ -109,7 +109,7 @@
|
|
|
<if test="user.params.endTime != null and user.params.endTime != ''"><!-- 结束时间检索 -->
|
|
|
AND date_format(u.create_time,'%y%m%d') <= date_format(#{user.params.endTime},'%y%m%d')
|
|
|
</if>
|
|
|
- <if test="user.deptId != null and user.deptId != 0">
|
|
|
+ <if test="user.deptId != null and user.deptId != '0'">
|
|
|
AND (u.dept_id = #{user.deptId} ) OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE #{user.deptId} = ANY(string_to_array(ancestors,',') ))
|
|
|
</if>
|
|
|
<!-- 数据范围过滤 -->
|
|
@@ -145,7 +145,7 @@
|
|
|
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
|
|
AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
|
|
</if>
|
|
|
- <if test="deptId != null and deptId != 0">
|
|
|
+ <if test="deptId != null and deptId != '0'">
|
|
|
AND (u.dept_id = #{user.deptId} ) OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE #{user.deptId} = ANY(string_to_array(ancestors,',') ))
|
|
|
</if>
|
|
|
<!-- 数据范围过滤 -->
|