From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml |    7 ++++++-
 1 files changed, 6 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..21d8414 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

--
Gitblit v1.9.3