From 549aea686efe7ef139a88b77c9b9814db37f9fd0 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:44 +0800
Subject: [PATCH] 修改我的审核和代办数量修复条件查询逻辑
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index e43c9be..ae227d1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -94,7 +94,13 @@
left join YWXT."BLADE_DICT_BIZ" as dict on de.device_type=dict.DICT_KEY and dict.CODE='SG_DEVICE_TYPE'
LEFT JOIN ywxt.sg_report_user userR ON report.id = userR.report_id
WHERE
- 1 = 1 and report."STATUS" != 4 and si.CONTROL_UNIT=#{dto.userUnit} and userR.roleId=#{dto.roleUnit}
+ 1 = 1 and report."STATUS" != 4
+ <if test="dto.userUnit != null and dto.userUnit != ''">
+ and si.CONTROL_UNIT=#{dto.userUnit}
+ </if>
+ <if test="dto.roleUnit != null and dto.roleUnit != ''">
+ and userR.role_id=#{dto.roleUnit}
+ </if>
<!-- AND userR.is_his = 0 -->
<if test="dto.projectName != null and dto.projectName != ''">
and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName}),'%')
--
Gitblit v1.9.3