feat(标准结构树): 拆分特殊过滤

laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java

@@ -1,29 +1,29 @@
 package com.jero.modules.laws.standard.controller;
 
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 import com.jero.common.api.vo.Result;
-import com.jero.common.exception.JeroBootException;
-import com.jero.common.util.MessageUtils;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel;
 import com.jero.modules.laws.standard.entity.LawsTreeNode;
 import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
 import com.jero.modules.system.vo.IdMapBody;
 import com.jero.modules.tag.enums.TableNameEnum;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
+
-import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
-import com.jero.common.aspect.annotation.AutoLog;
+import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang3.StringUtils;
+import java.util.List;
-import org.apache.poi.ss.formula.functions.T;
 
 import static com.jero.modules.laws.enterprise.EnterpriseConstants.LAWS_TREE_ROOT_NODE;
 
@@ -59,7 +59,7 @@ public class LawsTreeNodeController extends JeroController<LawsTreeNode, ILawsTr
     @ApiOperation(value = "国内标准-体系树", notes = "国内标准-体系树")
     @GetMapping("/domestic")
     public Result<List<LawsTreeNodeModel>> queryGBTreeList(@RequestParam(required = false) @ApiParam("节点名称") String nodeName,
-                                                           @RequestParam(required = false) @ApiParam("为空：显示我的收藏 1：不显示我的收藏") String option) {
+                                                           @RequestParam(required = false) @ApiParam("为空：显示我的收藏 1：不显示我的收藏 2: 拆分特殊过滤") String option) {
         String moduleCode = TableNameEnum.DOMESTIC_REGULATIONS.getValue();
         List<LawsTreeNodeModel> list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option);
         return Result.OK(list);

laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java

@@ -2,8 +2,10 @@ package com.jero.modules.laws.standard.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.FillRuleConstant;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.FillRuleUtil;
 import com.jero.modules.laws.enterprise.EnterpriseConstants;
 import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel;
@@ -12,18 +14,16 @@ import com.jero.modules.laws.standard.entity.LawsNodeRelation;
 import com.jero.modules.laws.standard.entity.LawsTreeNode;
 import com.jero.modules.laws.standard.mapper.LawsNodeRelationMapper;
 import com.jero.modules.laws.standard.mapper.LawsTreeNodeMapper;
-import com.jero.modules.laws.standard.service.*;
+import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
+import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.jero.common.exception.JeroBootException;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 树型节点
@@ -81,6 +81,15 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
             myCollect.setNodeType(EnterpriseConstants.NODE_TYPE_MY_COLLECT);
             lawsTreeNodeModels.add(myCollect);
         }
+
+        // 拆分特殊过滤
+        if (CollectionUtils.isNotEmpty(lawsTreeNodeModels) && "3".equals(option)){
+            List<LawsTreeNodeModel> children = lawsTreeNodeModels.get(0).getChildren();
+            List<LawsTreeNodeModel> collect = children.stream()
+                    .filter(node -> "A02A01".equals(node.getNodeCode()) || "A02A03".equals(node.getNodeCode()))
+                    .collect(Collectors.toList());
+            lawsTreeNodeModels.get(0).setChildren(collect);
+        }
         return lawsTreeNodeModels;
     }