From d4bd63ca04771ff0ad14048317000ad56545618a Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 8 May 2024 19:35:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E8=84=91=E5=9B=BE=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=92=8C=E6=8B=96=E6=8B=BD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/service/FunctionalCaseLogService.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java
index b915775e22..bf60d7e1e5 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseLogService.java
@@ -8,6 +8,7 @@ import io.metersphere.functional.constants.MinderLabel;
 import io.metersphere.functional.domain.*;
 import io.metersphere.functional.dto.BaseFunctionalCaseBatchDTO;
 import io.metersphere.functional.dto.FunctionalCaseHistoryLogDTO;
+import io.metersphere.functional.dto.MinderOptionDTO;
 import io.metersphere.functional.mapper.*;
 import io.metersphere.functional.request.*;
 import io.metersphere.project.domain.FileAssociation;
@@ -18,7 +19,6 @@ import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.system.domain.CustomField;
 import io.metersphere.system.domain.CustomFieldExample;
-import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.log.dto.LogDTO;
@@ -192,16 +192,16 @@ public class FunctionalCaseLogService {
         return dtoList;
     }
 
-    public List<LogDTO> deleteBatchMinderFunctionalCaseLog(List<OptionDTO> resourceList) {
+    public List<LogDTO> deleteBatchMinderFunctionalCaseLog(List<MinderOptionDTO> resourceList) {
         if (CollectionUtils.isEmpty(resourceList)) {
             return new ArrayList<>();
         }
-        Map<String, List<OptionDTO>> resourceMap = resourceList.stream().collect(Collectors.groupingBy(OptionDTO::getName));
-        List<OptionDTO> caseOptionDTOS = resourceMap.get(MinderLabel.CASE.toString());
+        Map<String, List<MinderOptionDTO>> resourceMap = resourceList.stream().collect(Collectors.groupingBy(MinderOptionDTO::getType));
+        List<MinderOptionDTO> caseOptionDTOS = resourceMap.get(MinderLabel.CASE.toString());
         if (CollectionUtils.isEmpty(caseOptionDTOS)) {
             return new ArrayList<>();
         }
-        List<String> caseIds = caseOptionDTOS.stream().map(OptionDTO::getId).toList();
+        List<String> caseIds = caseOptionDTOS.stream().map(MinderOptionDTO::getId).toList();
         return batchDeleteFunctionalCaseLogByIds(caseIds);
     }