From 59f282341982443016c908fff86da021aec094b4 Mon Sep 17 00:00:00 2001
From: "ys.git" <18439391935@163.com>
Date: Thu, 11 Dec 2025 16:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B7=BB=E5=8A=A0=E7=AE=A1?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActivitiProcessServiceImpl.java  |  5 +++--
 .../impl/EngineParamDetailServiceImpl.java        | 15 +++++++++------
 .../service/impl/EngineReviewListServiceImpl.java |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
index f23582e..44e10c4 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
@@ -250,8 +250,9 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
 
         EngineReviewListPojo reviewListPojo = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("id", approvalId).doQuery(EngineReviewListPojo.class).get(0);
-        if (reviewListPojo == null || reviewListPojo.getStatusCode() == ParamValueVersionEnum.REFUSE.getCode()) {
-            throw new RuntimeException("无效的审批记录");
+        if (reviewListPojo == null || reviewListPojo.getStatusCode() == ParamValueVersionEnum.REFUSE.getCode()
+        || reviewListPojo.getStatusCode() == ParamValueVersionEnum.PASSED.getCode()) {
+            throw new RuntimeException("无效的审批记录请检查是否已经审批完成或被拒绝");
         }
         //查看当前人是否有权限审批
         String currentAssignees = reviewListPojo.getApproverPersons();
diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
index 0705028..01706a4 100644
--- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
@@ -360,12 +360,15 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             String id = engineParamDetailPojo.getId();
             EngineParamDetailPojo engineParamDetailPojo1 = selectById(id);
             String filledBy = engineParamDetailPojo1.getFilledBy();
-            sw.buildFromDatasource("xdap_app_223770822127386625")
-                    .update("is_delete", 1)
-                    .update("last_update_date", new Date())
-                    .eq("owner_id", filledBy)
-                    .eq("current_node", "数据维护")
-                    .doUpdate(TodoTaskPojo.class);
+            if (ObjectUtils.isNotEmpty(filledBy)) {
+                sw.buildFromDatasource("xdap_app_223770822127386625")
+                        .update("is_delete", 1)
+                        .update("last_update_date", new Date())
+                        .eq("owner_id", filledBy)
+                        .eq("current_node", "数据维护")
+                        .doUpdate(TodoTaskPojo.class);
+            }
+
 
             //应该不会有新增参数 要不然还要给参数绑定部门，责任人，填写人
 //                EngineParamDetailPojo ei = new EngineParamDetailPojo();
diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
index 93f6cb5..b8a25c4 100644
--- a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
@@ -44,8 +44,8 @@ public class EngineReviewListServiceImpl implements EngineReviewListService {
                 .like("subsystem_name",  engineReviewListRequest.getSubsystemName())
                 .like("status_description",  engineReviewListRequest.getStatusDescription())
                 .eq("yc_or_oth", engineReviewListRequest.getYcOrOth())
-                .eq("applicant", engineReviewListRequest.getApplicant())
-                .or()
+                .eq("applicant", engineReviewListRequest.getUserID())
+                .conjuctionOr()
                 .like("approver_persons",engineReviewListRequest.getUserID() )
                 .doPageQuery(page, size, EngineReviewListPojo.class);