From 9cd97ee573c04724e8c4921fed9a07d01b072e0c Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Fri, 21 Apr 2023 11:46:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96[=E5=88=A0=E9=99=A4=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=8E=A5=E5=8F=A3]=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/report/service/impl/ITreeLabelServiceImpl.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java
index 44e8f9b..8807e16 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java
@@ -117,7 +117,7 @@ public class ITreeLabelServiceImpl extends ServiceImpl<TreeLabelDao, TreeLabelEn
             //编辑标签
             //不能设置上级标签为自己
             if (entity.getParentId().equals(entity.getId())) {
-               throw new AdcDaBaseException("不能设置上级标签为自身");
+                throw new AdcDaBaseException("不能设置上级标签为自身");
             }
             TreeLabelEntity treeLabelEntity = treeLabelDao.selectById(entity.getId());
             if (Objects.nonNull(treeLabelEntity)) {
@@ -156,11 +156,8 @@ public class ITreeLabelServiceImpl extends ServiceImpl<TreeLabelDao, TreeLabelEn
     public boolean deleteById(String id) {
         List<String> nodeAndChildrenIds = findNodeAndChildrenIds(getTreeLabelRoot(), id).stream().distinct().collect(Collectors.toList());
         LambdaQueryWrapper<ReportLabelEntity> wrapper = new LambdaQueryWrapper<>();
-        nodeAndChildrenIds.forEach(labelLd -> {
-            wrapper.eq(ReportLabelEntity::getLabelId, labelLd);
-            reportLabelDao.delete(wrapper);
-        });
-
+        wrapper.in(ReportLabelEntity::getLabelId, nodeAndChildrenIds);
+        reportLabelDao.delete(wrapper);
         int i = treeLabelDao.deleteBatchIds(nodeAndChildrenIds);
         return i != 0;
     }