1

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -453,19 +453,19 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
             role = (String) params.get("role");
         }
         if("admin".equals(loginUser.getUsername())){
-            return baseMapper.selectDeptListMapper(dept);
+            return baseMapper.selectDeptOldList(dept);
         }else {
             if("school".equals(role)){
                 dept.setDeptId(loginUser.getDeptId());
                 dept.setParentId(loginUser.getDeptId());
-                return baseMapper.selectDeptListMapper(dept);
+                return baseMapper.selectDeptOldList(dept);
             }else if("teacher".equals(role)){
                 //查询老师的班级
                 FormalTeacherClassBo bo = new FormalTeacherClassBo();
                 bo.setTeacherId(loginUser.getUserId());
                 List<FormalTeacherClassVo> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(loginUser.getUserId()));
                 List<Long> deptIdList = teacherClass.stream().map(FormalTeacherClassVo::getClassId).collect(Collectors.toList());
-                deptIdList.add(loginUser.getDeptId());
+                //deptIdList.add(loginUser.getDeptId());
                 return baseMapper.selectDeptListMapperByIdList(deptIdList);
             }
             return new ArrayList<>();