角色查询父子关系代码优化

ibzuaa-core/src/main/java/cn/ibizlab/core/extensions/service/SysRoleExService.java

@@ -14,7 +14,6 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.util.ObjectUtils;
 
 import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 实体[系统角色] 自定义服务对象
@@ -47,31 +46,30 @@ public class SysRoleExService extends SysRoleServiceImpl {
     @Override
     @SneakyThrows
     public Page<SysRole> searchNoRepeat(SysRoleSearchContext context) {
-        List<SysRole> newResult = new CopyOnWriteArrayList<>();
-        String sysRoleid = (String) context.getParams().get("sys_roleid");
+        List<SysRole> newResult = new ArrayList<>();
+        String sysRoleId = (String) context.getParams().get("sys_roleid");
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysRole> pages = baseMapper.searchNoRepeat(context.getPages(),context,context.getSelectCond());
 
-        if(!ObjectUtils.isEmpty(sysRoleid)){
-            findSRelation(result,pages.getRecords(),sysRoleid);
-            newResult.addAll(findPRelation(sysRoleid,new ArrayList<SysRole>()));
+        if(!ObjectUtils.isEmpty(sysRoleId)){
+            findSRelation(pages.getRecords(),sysRoleId);
+            newResult.addAll(findPRelation(sysRoleId,new ArrayList<>()));
             newResult.addAll(result);
             result.clear();
         }
-        for (int i = 0;i < newResult.size();i++){
-            for (int j = 0;j < pages.getRecords().size();j++){
-                if(pages.getRecords().get(j).getRoleid().equals(newResult.get(i).getRoleid())){
+        for (SysRole sysRole : newResult) {
+            for (int j = 0; j < pages.getRecords().size(); j++) {
+                if (pages.getRecords().get(j).getRoleid().equals(sysRole.getRoleid())) {
                     pages.getRecords().remove(j);
                 }
             }
         }
-        return new PageImpl<SysRole>(pages.getRecords(), context.getPageable(), pages.getTotal() - newResult.size());
+        return new PageImpl<>(pages.getRecords(), context.getPageable(), pages.getTotal() - newResult.size());
     }
 
     /**
      * 递归获取某个子节点的所有父节点
      * @param contextId 上下文中当前子节点id
      * @param pList 父id集合
-     * @return
      */
     private List<SysRole> findPRelation(String contextId,List<SysRole> pList){
         SysRole currentSysRole = baseMapper.selectById(contextId);
@@ -90,15 +88,14 @@ public class SysRoleExService extends SysRoleServiceImpl {
 
     /**
      * 递归获取某个父节点下的所有子节点
-     * @param childRole 返回的结果
      * @param roleList  数据库查询出来的所有角色集合
      * @param pId      父id
      */
-    private void findSRelation(List<SysRole> childRole,List<SysRole> roleList, String pId) {
+    private void findSRelation(List<SysRole> roleList, String pId) {
         for (SysRole role : roleList) {
             if (!StringUtils.isEmpty(role.getProleid())) {
                 if (role.getProleid().equals(pId)) {
-                    findSRelation(childRole,roleList, role.getRoleid());
+                    findSRelation(roleList, role.getRoleid());
                     result.add(role);
                     }
                 }