From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
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