diff --git a/continew-system/src/main/resources/mapper/NoticeMapper.xml b/continew-system/src/main/resources/mapper/NoticeMapper.xml index ebab8974..8cc720e1 100644 --- a/continew-system/src/main/resources/mapper/NoticeMapper.xml +++ b/continew-system/src/main/resources/mapper/NoticeMapper.xml @@ -27,6 +27,7 @@ WHERE t1.deleted = 0 + AND t1.status = 3 AND (t1.notice_scope = 1 OR (t1.notice_scope = 2 AND JSON_CONTAINS(t1.notice_users, CONCAT('"', #{query.userId}, '"')))) @@ -55,7 +56,7 @@ t1.id FROM sys_notice AS t1 LEFT JOIN sys_notice_log AS t2 ON t2.notice_id = t1.id AND t2.user_id = #{userId} - WHERE t1.deleted = 0 + WHERE t1.deleted = 0 AND t1.status = 3 AND (t1.notice_scope = 1 OR (t1.notice_scope = 2 AND JSON_CONTAINS(t1.notice_users, CONCAT('"', #{userId}, '"'))))