diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml b/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml index df5e9c42..562094fd 100644 --- a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml +++ b/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml @@ -155,22 +155,24 @@ left join t_notice_type on t_notice.notice_type_id = t_notice_type.notice_type_id - t_notice.notice_id in - (select t_notice_visible_range.notice_id - from t_notice_visible_range - where - (t_notice_visible_range.data_type = #{departmentDataType} - - and - t_notice_visible_range.data_id - in - - #{item} - - - ) - or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id = - #{requestEmployeeId} ) + ( + t_notice.notice_id in + (select t_notice_visible_range.notice_id + from t_notice_visible_range + where + ( t_notice_visible_range.data_type = #{departmentDataType} + + and + t_notice_visible_range.data_id + in + + #{item} + + + ) + or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id = #{requestEmployeeId} ) + ) + or t_notice.all_visible_flag = true ) and t_notice.all_visible_flag = true