|
@@ -236,21 +236,21 @@
|
|
|
${ew.customSqlSegment}
|
|
|
<if test="currentUser.id != '1'.toString">
|
|
|
<if test="isBmzr == '0'.toString">
|
|
|
- and cw_pa.create_by = #{currentUser.id} or cw_pa.project_id in (
|
|
|
+ and (cw_pa.create_by = #{currentUser.id} or cw_pa.project_id in (
|
|
|
select cw_pm.project_id
|
|
|
from cw_project_members cw_pm
|
|
|
where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
|
|
|
- )
|
|
|
+ ))
|
|
|
</if>
|
|
|
<if test="isBmzr == '1'.toString">
|
|
|
- and cw_pa.create_by in (
|
|
|
+ and (cw_pa.create_by in (
|
|
|
select su.id from sys_user su where su.del_flag = '0' and su.office_id in
|
|
|
(select so.id from sys_office so where so.id = #{currentUser.officeDTO.id} or so.parent_ids like concat('%',#{currentUser.officeDTO.id},'%') and so.del_flag = '0')
|
|
|
) or cw_pa.project_id in (
|
|
|
select cw_pm.project_id
|
|
|
from cw_project_members cw_pm
|
|
|
where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
|
|
|
- )
|
|
|
+ ))
|
|
|
</if>
|
|
|
</if>
|
|
|
ORDER BY cw_pa.create_date DESC
|