机构 添加 机构id 机构来源 赛选条件

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -32,7 +32,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
     @Override
     public List<SysDept> findTree(String deptId,String managementSource) {
-        if(null == deptId || "".equals(deptId)){
+        if(null == deptId || "".equals(deptId) || "undefined".equals(deptId)){
             deptId = "9";
         }
 
@@ -43,7 +43,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         lqw.orderByDesc(SysDept::getOrderNum);
         List<SysDept> sysDeptList = list(lqw);
         //判断机构来源条件 进行遍历
-        if(null != managementSource && !"".equals(managementSource)){
+        if(null != managementSource && !"undefined".equals(managementSource) && !"".equals(managementSource)){
             lqw.eq(SysDept::getManagementSource,managementSource);
             //条件
             List<SysDept> conditionList = list(lqw);
@@ -57,7 +57,13 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
             //再查前4层
             int level = 5;
             while(level > 0){
-                result = recursion(sysDeptList, conditionMap);
+                List<SysDept> resultTmp = recursion(sysDeptList, conditionMap);
+                if(resultTmp.size() == 0){
+                    break;
+                }else{
+                    result.clear();
+                    result.addAll(resultTmp);
+                }
                 conditionMap = result.stream().collect(Collectors.groupingBy(SysDept::getParentId));
                 level--;
             }