From 1982ca657ae879f9033899f9ed94628ed4b20a2c Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sat, 14 Sep 2024 18:20:36 +0800
Subject: [PATCH] 湖北水库:待办列表修复

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 ae227d1..a161771 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
@@ -83,7 +83,7 @@
         DBMS_LOB.SUBSTR(report.video_urls) videoUrls,
         de.device_name,
         de.device_type,
-       <!-- userR.approval_status, -->
+        userR.approval_status,
         dict."DICT_VALUE" as typeName,
         si.control_unit,si.self_unit,dria."county_cd"
         FROM
@@ -99,7 +99,7 @@
             and  si.CONTROL_UNIT=#{dto.userUnit}
         </if>
         <if test="dto.roleUnit != null and dto.roleUnit != ''">
-            and userR.role_id=#{dto.roleUnit}
+            and userR.role_id=#{dto.roleUnit} and report.audit_person = #{dto.roleUnit}
         </if>
        <!-- AND userR.is_his = 0 -->
         <if test="dto.projectName != null and dto.projectName != ''">

--
Gitblit v1.9.3