diff --git a/src/main/java/com/biutag/supervision/service/RiskScoreRuleService.java b/src/main/java/com/biutag/supervision/service/RiskScoreRuleService.java index a4939c1..c37dbf0 100644 --- a/src/main/java/com/biutag/supervision/service/RiskScoreRuleService.java +++ b/src/main/java/com/biutag/supervision/service/RiskScoreRuleService.java @@ -41,8 +41,16 @@ public class RiskScoreRuleService extends ServiceImpl children = models.stream().filter( model -> { for (RiskClassModel riskClassModel : treeList) { - return item.getId().equals(riskClassModel.getPid()) && riskClassModel.getId().equals(model.getRiskScoreRuleId()); + boolean b = item.getId().equals(riskClassModel.getPid()) && riskClassModel.getId().equals(model.getRiskScoreRuleId()); + System.out.println("测试1当前item:【id:" + item.getId() + ",pid:" + item.getPid() + + "】,当前model:【id:" + model.getId() + ",risk_id:" + model.getRiskScoreRuleId() + + "】,当前riskClassModel:【id:" + riskClassModel.getId() + ",pid:" + riskClassModel.getPid() + + ",name:" + riskClassModel.getName() + ",size:" + riskClassModel.getSize()); + return b; } + System.out.println("测试2当前item:【id:" + item.getId() + ",pid:" + item.getPid() + + "】,当前model:【id:" + model.getId() + ",risk_id:" + model.getRiskScoreRuleId() + + "】"); return false; } ).map(RiskTree::of).toList(); @@ -50,23 +58,6 @@ public class RiskScoreRuleService extends ServiceImpl scoreRules = list(new LambdaQueryWrapper().orderByAsc(RiskScoreRule::getSortId)); -// Map> childMap = new HashMap<>(); -// List tree = new ArrayList<>(); -// for (RiskScoreRule rule: scoreRules) { -// RiskScoreRuleTree node = new RiskScoreRuleTree(); -// BeanUtils.copyProperties(rule, node); -// List children = childMap.computeIfAbsent(node.getPid(), k -> new ArrayList<>()); -// children.add(node); -// Integer pid = node.getPid(); -// if (AppConstants.TREE_ROOT_ID.equals(pid)) { -// tree.add(node); -// } -// } -// for (RiskScoreRuleTree node : tree) { -// buildTreeRecursive(node, childMap); -// } -// return tree; } public List oldBuildTree() {