From 4acb10b72df44da78d19f2f8a043c9fbc3b147e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Wed, 19 Feb 2025 17:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E8=87=AA=E5=8A=A8=E8=AE=A4?=
 =?UTF-8?q?=E9=A2=86=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...stmentIdentificationMaterialServiceImpl.java | 11 ++++++++---
 .../service/impl/EntrustmentServiceImpl.java    | 17 ++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
index cee6068..8e50bc5 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
@@ -521,9 +521,14 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
             throw new RuntimeException("委托不在待审核状态");
         }
 
-        if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) {
-            String uName = this.getUserNameByEntrustUserID(entrustment.getCheckClaimUser());
-            throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", uName));
+        // 这里做一下优化，因为我们要去掉委托认领的功能，所以只要当前用户在审核人列表中，就可以进行操作
+//        if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) {
+//            String uName = this.getUserNameByEntrustUserID(entrustment.getCheckClaimUser());
+//            throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", uName));
+//        }
+
+        if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
+            throw new RuntimeException(String.format("你不在可以审核的用户列表中!"));
         }
 
         //-------------------
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index 5565f06..c689d10 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -935,7 +935,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
      *
      * @param entrustId
      * @param whatBook  entrust-委托书  identItemBook-鉴定事项确认书  identfyBook-鉴定书
-     * @param docType 该参数只有用于委托书上
+     * @param docType   该参数只有用于委托书上
      * @return
      */
     @Override
@@ -1470,9 +1470,13 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
         }
 
-        if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) {
-            throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
+        // 这里修改一下，我们要去掉委托认领的功能，所以只要用户是在审核列表中的，就可以进行审核操作
+        if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
+            throw new RuntimeException("你不在可以审核的用户列表当中!");
         }
+//        if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) {
+//            throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
+//        }
 
         if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) {
             throw new RuntimeException("委托不在待审核状态");
@@ -1717,9 +1721,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
         }
 
-        if (!dlpUser.getId().equals(entrustment.getApproveClaimUser())) {
-            throw new RuntimeException(String.format("委托的审批任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
+        if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
+            throw new RuntimeException("你不在可以进行审批的用户列表中!");
         }
+//        if (!dlpUser.getId().equals(entrustment.getApproveClaimUser())) {
+//            throw new RuntimeException(String.format("委托的审批任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
+//        }
 
         if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) {
             throw new RuntimeException("委托不在待审批状态");