From 35d0184fef92f65f6b9c2516947e41fe6bcc3054 Mon Sep 17 00:00:00 2001
From: yangsong <yangsong@axzo.cn>
Date: Sun, 8 Oct 2023 17:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=B7=BB=E5=8A=A0=E7=AB=AF?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SaasFeatureApplyServiceImpl.java     | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java
index a2e65817..95cdbc30 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java
@@ -4,7 +4,6 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.util.RandomUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +29,7 @@ import cn.axzo.tyr.server.repository.entity.SaasFeatureApplyDetail;
 import cn.axzo.tyr.server.service.PermissionPointService;
 import cn.axzo.tyr.server.service.SaasFeatureApplyDetailService;
 import cn.axzo.tyr.server.service.SaasFeatureApplyService;
+import cn.hutool.core.util.RandomUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -287,16 +287,19 @@ public class SaasFeatureApplyServiceImpl implements SaasFeatureApplyService {
                         && (!Objects.equals(p.getDataType(), 1) && !Objects.equals(p.getDataType(), 2)))
             .map(SubmitPermissionPointApplyVO.SubmitPermissionPointInfoVO::getPermissionPointId).distinct().sorted()
             .collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(featureIds)) {
-            throw new ServiceException("数据错误, 父节点为空");
-        }
-        List<PermissionPointTreeNode> featureNodes = permissionPointService.listNodesByIds(featureIds);
-        if (featureNodes.size() != featureIds.size()) {
-            List<Long> existIds =
-                featureNodes.stream().map(PermissionPointTreeNode::getPermissionPointId).collect(Collectors.toList());
-            throw new ServiceException(
-                String.format("数据错误, 权限点【%s】不存在", JSON.toJSONString(CollectionUtils.subtract(featureIds, existIds))));
+        List<PermissionPointTreeNode> featureNodes;
+        if (CollectionUtils.isNotEmpty(featureIds)) {
+            featureNodes = permissionPointService.listNodesByIds(featureIds);
+            if (featureNodes.size() != featureIds.size()) {
+                List<Long> existIds =
+                        featureNodes.stream().map(PermissionPointTreeNode::getPermissionPointId).collect(Collectors.toList());
+                throw new ServiceException(
+                        String.format("数据错误, 权限点【%s】不存在", JSON.toJSONString(CollectionUtils.subtract(featureIds, existIds))));
+            }
+        } else {
+            featureNodes = new ArrayList<>();
         }
+
         Map<Long, PermissionPointTreeNode> featureMap = featureNodes.stream().collect(
             Collectors.toMap(PermissionPointTreeNode::getPermissionPointId, Function.identity(), (e1, e2) -> e2));
         Map<String, List<SubmitPermissionPointApplyVO.SubmitPermissionPointInfoVO>> pointMap = flatPoints.stream()