移动到自定义代码部分

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

@@ -22,7 +22,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 @Primary
 @Service("SysRoleExService")
 public class SysRoleExService extends SysRoleServiceImpl {
-    List<SysRole> result = new ArrayList<>();
+    List<String> result = new ArrayList<>();
 
     @Override
     protected Class currentModelClass() {
@@ -45,28 +45,22 @@ public class SysRoleExService extends SysRoleServiceImpl {
      */
     @Override
     public Page<SysRole> searchNoRepeat(SysRoleSearchContext context) {
-        List<SysRole> newResult = new CopyOnWriteArrayList<>();
+        List<String> newResult = new CopyOnWriteArrayList<>();
         String sysRoleid = (String) context.getParams().get("sys_roleid");
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysRole> pages=baseMapper.searchNoRepeat(context.getPages(),context,context.getSelectCond());
         List<SysRole> sysRoles = new ArrayList<>();
         SysRole currentSysRole = baseMapper.selectById(sysRoleid);
 
         if(!ObjectUtils.isEmpty(currentSysRole)){
             sysRoles.add(currentSysRole);
-            selectChild(sysRoles);
-            // 加入父子级关联对象
-            newResult.addAll(findPRelation(sysRoleid,new ArrayList<SysRole>()));
+            findSRelation(sysRoles);
+            newResult.addAll(findPRelation(sysRoleid,new ArrayList<String>()));
             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())){
-                    pages.getRecords().remove(j);
-                }
-            }
-        }
-        return new PageImpl<SysRole>(pages.getRecords(), context.getPageable(), pages.getTotal()-newResult.size());
+        String noRepeat = String.join(";", newResult);
+        context.setN_sys_roleid_notin(noRepeat);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysRole> pages=baseMapper.searchNoRepeat(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<SysRole>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
     /**
@@ -74,14 +68,13 @@ public class SysRoleExService extends SysRoleServiceImpl {
      * @param contextId
      * @return
      */
-    private List<SysRole> findPRelation(String contextId,List<SysRole> pList){
+    private List<String> findPRelation(String contextId,List<String> pList){
         SysRole currentSysRole = baseMapper.selectById(contextId);
-
         // 查出当前id的所有父级别id
         if (!ObjectUtils.isEmpty(currentSysRole)){
             String proleId =  currentSysRole.getProleid();
             if(!StringUtils.isEmpty(proleId)){
-                pList.add(currentSysRole);
+                pList.add(currentSysRole.getRoleid());
                 return findPRelation(proleId,pList);
             }else {
                 return pList;
@@ -95,23 +88,18 @@ public class SysRoleExService extends SysRoleServiceImpl {
      * @return
      */
 
-    public void selectChild(List<SysRole> ids){
-        //用来存取调用自身递归时的参数
+    public void findSRelation(List<SysRole> ids){
         List<SysRole> temp= new ArrayList<SysRole>();
-        //查询数据库中对应id的实体类
         List<SysRole> sysEnterpriseOrgList = new ArrayList<SysRole>();
-        //遍历传递过来的参数ids
         for (SysRole sRole :ids) {
-            //查询子级架构
-            sysEnterpriseOrgList= selectByProleid(sRole.getRoleid());
-            //遍历list获取符合条件的对象的id值，一份存到temp中用作递归的参数，并存到全局变量中用来获取所有符合条件的id
+            sysEnterpriseOrgList = selectByProleid(sRole.getRoleid());
             for (SysRole s:sysEnterpriseOrgList) {
                 temp.add(s);
-                result.add(s);
+                result.add(s.getRoleid());
             }
         }
-        if(temp.size()!=0&&temp!=null){
-            selectChild(temp);
+        if(!ObjectUtils.isEmpty(temp)){
+            findSRelation(temp);
         }
     }
 }