From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批

---
 src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 4682317..00f7163 100644
--- a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
+++ b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
@@ -37,9 +37,14 @@
     <select id="selectNoticePage" resultMap="noticeVOResultMap">
         SELECT
         n.*,
-        d.dict_value AS categoryName
+        d.dict_value AS categoryName,
+        bd.dept_name deptName
         FROM
         blade_notice n
+        left join
+        blade_dept bd
+        on
+        bd.id = n.dept_id
         LEFT JOIN
         ( SELECT * FROM blade_dict WHERE code = 'notice' ) d
         ON
@@ -58,6 +63,9 @@
         <if test="notice.category!=null">
             and n.category = #{notice.category}
         </if>
+        <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} or bu.jurisdiction = #{notice.jurisdiction}
             or n.dept_id = 1123598813738675201

--
Gitblit v1.9.3