|
@@ -110,7 +110,7 @@
|
|
AND date_format(u.create_time,'%y%m%d') <= date_format(#{user.params.endTime},'%y%m%d')
|
|
AND date_format(u.create_time,'%y%m%d') <= date_format(#{user.params.endTime},'%y%m%d')
|
|
</if>
|
|
</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,',') )
|
|
|
|
|
|
+ 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>
|
|
</if>
|
|
<!-- 数据范围过滤 -->
|
|
<!-- 数据范围过滤 -->
|
|
<if test="user.params.dataScope != null and user.params.dataScope != ''">
|
|
<if test="user.params.dataScope != null and user.params.dataScope != ''">
|
|
@@ -146,7 +146,7 @@
|
|
AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
|
AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
|
</if>
|
|
</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,',') )
|
|
|
|
|
|
+ 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>
|
|
</if>
|
|
<!-- 数据范围过滤 -->
|
|
<!-- 数据范围过滤 -->
|
|
<if test="params.dataScope != null and params.dataScope != ''">
|
|
<if test="params.dataScope != null and params.dataScope != ''">
|