From 0a8e2089cdeb341816355c6374469c36b20d3bae 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: Tue, 12 Nov 2024 16:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EntrustmentServiceImpl.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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 4cc6f5d..a1d49d7 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
@@ -758,12 +758,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 .stream()
                 .collect(
                         Collectors.groupingBy(item ->
-                                item.getAnalysisOption() +
-                                        "_" +
-                                        DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs())
-                                                .stream()
-                                                .map(DrugLite::getName)
-                                                .collect(Collectors.joining("")),
+                                        item.getAnalysisOption() +
+                                                "_" +
+                                                DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs())
+                                                        .stream()
+                                                        .map(DrugLite::getName)
+                                                        .collect(Collectors.joining("")),
                                 LinkedHashMap::new, // 返回有序map
                                 Collectors.toList())
                 );
@@ -1625,8 +1625,10 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         if (!this.update(null, updateWrapper)) {
             throw new RuntimeException("保存委托信息失败");
         }
-        this.bizApprover_Claim(entrust, dlpUser);
-        this.bizApprover_Apply(entrust, 1, dlpUser);
+        if (opCode == 1) {
+            this.bizApprover_Claim(entrust, dlpUser);
+            this.bizApprover_Apply(entrust, 1, dlpUser);
+        }
         // 从数据库表中取出保存的委托对象, 后续的操作我们以此为准
         entrustment = this.getById(entrust.getId());
         if (entrustment == null) {