From 138cac5008689fadaa96ecac116a2297bb69bc1c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 04 Mar 2022 10:45:40 +0800
Subject: [PATCH] 1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证生成修改
---
src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 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 83516a1..bb68904 100644
--- a/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
+++ b/src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml
@@ -49,6 +49,8 @@
( SELECT * FROM blade_dict WHERE code = 'notice' ) d
ON
n.category = d.dict_key
+ left join sys_information si on si.departmentid = bd.id
+ left join sys_jurisdiction sj on sj.id = si.jurisdiction
WHERE
n.is_deleted = 0
<if test="notice.title!=null">
@@ -63,6 +65,9 @@
<if test="notice.deptId!=null and notice.deptId!=''">
and n.dept_id = #{notice.deptId}
</if>
+ <if test="notice.jurisdiction!=null and notice.jurisdiction!='' and notice.jurisdiction!='1372091709474910209'">
+ and (sj.id=#{notice.jurisdiction} or sj.parent_id = #{notice.jurisdiction})
+ </if>
<if test="notice.startTime!=null and notice.startTime!=''">
and n.release_time >= #{notice.startTime}
</if>
--
Gitblit v1.9.3