From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
index 21d8414..83516a1 100644
--- a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
+++ b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
@@ -49,12 +49,6 @@
         ( SELECT * FROM blade_dict WHERE code = 'notice' ) d
         ON
         n.category = d.dict_key
-        <if test="notice.deptId!=null and notice.jurisdiction!=null">
-            left join
-            blade_user bu
-            on
-            bu.dept_id = n.dept_id
-        </if>
         WHERE
         n.is_deleted = 0
         <if test="notice.title!=null">
@@ -63,15 +57,11 @@
         <if test="notice.category!=null">
             and n.category = #{notice.category}
         </if>
-        <if test="notice.deptId!=null and notice.jurisdiction!=null">
-            and (n.dept_id = #{notice.deptId} or bu.jurisdiction = #{notice.jurisdiction}
-            or n.dept_id = 1123598813738675201
-            )
+        <if test="notice.type!=null">
+            and n.type = #{notice.type}
         </if>
-        <if test="notice.deptId!=null and notice.jurisdiction==null">
-            and (n.dept_id = #{notice.deptId} and n.category=2
-            or n.dept_id = 1123598813738675201
-            )
+        <if test="notice.deptId!=null and notice.deptId!=''">
+            and n.dept_id = #{notice.deptId}
         </if>
         <if test="notice.startTime!=null and notice.startTime!=''">
             and n.release_time &gt;= #{notice.startTime}

--
Gitblit v1.9.3