From fe5d8690dfaea4665457f4c77d0056f2355a68e4 Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Tue, 15 Jul 2025 14:04:41 +0800
Subject: [PATCH] =?UTF-8?q?20250715=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entrustment/dto/ApprovedUpdateEntrustDTO.java |  2 +-
 .../impl/EntrustAlterApplyServiceImpl.java        | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java
index 8373ae5..a602dcc 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java
@@ -39,7 +39,7 @@ public class ApprovedUpdateEntrustDTO {
     private List<MaterialDTO> materialList;
 
     @ApiModelProperty("嫌疑人信息")
-    private List<Suspect> suspectList;
+    private List<Suspect> suspects;
 
     @ApiModelProperty(value = "案发时间")
     private LocalDateTime happenTime;
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
index 4222933..483f57c 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
@@ -252,9 +252,9 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
             updateRecordBuilder.append("<br>该委托案件的委托类型由 [").append(entrustVO.getEntrustmentType() == 0 ? "常规毒品" : "生物样本").append("] 更改为 [").append(dto.getEntrustmentType() == 0 ? "常规毒品" : "生物样本").append("] 。");
         }
         // 更新嫌疑人信息
-        if (CollUtil.isNotEmpty(dto.getSuspectList())) {
-            processUpdateSuspectInfo(dto.getSuspectList(), entrustVO.getSuspects(), updateRecordBuilder, opDate);
-            suspectService.addSuspectList(dto.getSuspectList(), entrustVO.getId());
+        if (CollUtil.isNotEmpty(dto.getSuspects())) {
+            processUpdateSuspectInfo(dto.getSuspects(), entrustVO.getSuspects(), updateRecordBuilder, opDate);
+            suspectService.addSuspectList(dto.getSuspects(), entrustVO.getId());
             // 删除旧的嫌疑人信息
             if (CollUtil.isNotEmpty(entrustVO.getSuspects())) {
                 suspectService.removeBatchByIds(entrustVO.getSuspects().stream().map(Suspect::getId).collect(Collectors.toList()));
@@ -299,18 +299,19 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
         // 转map，便于后续操作
         Map<String, Suspect> oldSuspectMap = oldSuspectList.stream().collect(Collectors.toMap(Suspect::getId, Function.identity()));
         for (Suspect suspect : newSuspectList) {
-            if (StrUtil.isBlank(suspect.getId()) || !oldSuspectMap.containsKey(suspect.getId())) {
+            String phoneNumber = suspect.getPhoneNumber() == null ? "" : suspect.getPhoneNumber();
+            if (StrUtil.isBlank(suspect.getId())) {
                 // 新增嫌疑人
                 opDate = initUpdateRecordInfo(opDate, updateRecordBuilder, 2);
                 updateRecordBuilder.append("<br>新增嫌疑人：姓名[").append(suspect.getName())
                         .append("]，身份证号[").append(suspect.getIdNumber())
-                        .append("]，联系电话[").append(suspect.getPhoneNumber()).append("]");
+                        .append("]，联系电话[").append(phoneNumber).append("]");
             } else {
                 // 更新嫌疑人信息
                 Suspect oldSuspect = oldSuspectMap.get(suspect.getId());
                 boolean changeName = !Objects.equals(oldSuspect.getName(), suspect.getName());
                 boolean changeIdNumber = !Objects.equals(oldSuspect.getIdNumber(), suspect.getIdNumber());
-                boolean changePhone = !Objects.equals(oldSuspect.getPhoneNumber(), suspect.getPhoneNumber());
+                boolean changePhone = !Objects.equals(oldSuspect.getPhoneNumber(), phoneNumber);
                 if (changeName || changeIdNumber || changePhone) {
                     opDate = initUpdateRecordInfo(opDate, updateRecordBuilder, 2);
                     updateRecordBuilder.append("<br>原嫌疑人信息：姓名[").append(oldSuspect.getName())
@@ -320,7 +321,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
                             .append(suspect.getName()).append("]，身份证号[")
                             .append(suspect.getIdNumber())
                             .append("]，联系电话[")
-                            .append(suspect.getPhoneNumber()).append("]");
+                            .append(phoneNumber).append("]");
                 }
             }
         }