785834757 2 роки тому
батько
коміт
3ea09b0221

+ 6 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -78,13 +78,17 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         }
         // 如果指定的部门ID为空或特定值,则使用当前用户所在部门ID
         if (null == deptId || "".equals(deptId) || "undefined".equals(deptId)) {
-            deptId = user.getDeptId();
+            if(!treeShowLevel.getShowLevel().equals("all")) {
+                deptId = user.getDeptId();
+            }else{
+                deptId = "9";
+            }
         }
 
         // 根据用户的部门树展示级别查询相应的部门树
         switch (treeShowLevel.getShowLevel()) {
             case "all":
-                treeByShowLevel = findTreeByShowLevel("9", managementSource, "all");
+                treeByShowLevel = findTreeByShowLevel(deptId, managementSource, "all");
                 break;
             case "same":
                 treeByShowLevel = findTreeByShowLevel(deptId, managementSource, "same");