From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml | 20 ++++++--------------
1 files changed, 6 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 00f7163..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,12 +49,8 @@
( 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>
+ 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">
@@ -66,15 +62,11 @@
<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
- )
+ <if test="notice.deptId!=null and notice.deptId!=''">
+ and n.dept_id = #{notice.deptId}
</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.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}
--
Gitblit v1.9.3