From 28834e2515ac87f75060a469cc2e6a2c6fa253c4 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 22 Feb 2024 11:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=91=98=E5=B7=A5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=88=B0=E6=9C=AA=E8=AF=BB=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/oa/notice/NoticeDao.xml   | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

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
         <where>
             <if test="!administratorFlag">
-                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}
-                <if test="requestEmployeeDepartmentIdList != null and requestEmployeeDepartmentIdList.size > 0">
-                    and
-                    t_notice_visible_range.data_id
-                    in
-                    <foreach collection="requestEmployeeDepartmentIdList" open="(" close=")" separator="," item="item">
-                        #{item}
-                    </foreach>
-                </if>
-                )
-                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}
+                        <if test="requestEmployeeDepartmentIdList != null and requestEmployeeDepartmentIdList.size > 0">
+                            and
+                            t_notice_visible_range.data_id
+                            in
+                            <foreach collection="requestEmployeeDepartmentIdList" open="(" close=")" separator="," item="item">
+                                #{item}
+                            </foreach>
+                        </if>
+                        )
+                        or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id = #{requestEmployeeId} )
+                    )
+                    or t_notice.all_visible_flag = true
                 )
             </if>
             and t_notice.all_visible_flag = true