wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

直接添加端下一级菜单bugfix

Browse Source
This commit is contained in:
yangsong 2023-10-08 17:12:39 +08:00
parent e2a100fdd9
commit 35d0184fef
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java
View File

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