bug

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -302,16 +302,17 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     @Override
     public List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum) {
-
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = null;
-        if (OrgTypeEnum.TEACHING_ROOM.equals(orgTypeEnum)){
+        if (OrgTypeEnum.TEACHING_ROOM.equals(orgTypeEnum)) {
             orgIds = teachcloudCommonService.listSubOrgIds(null);
         }
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysOrg::getType, orgTypeEnum)
+        queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId)
+                .eq(SysOrg::getType, orgTypeEnum)
                 .eq(SysOrg::getEnable, true);
-        if (Objects.nonNull(orgIds)){
-            queryWrapper.lambda().in(SysOrg::getId,orgIds);
+        if (Objects.nonNull(orgIds)) {
+            queryWrapper.lambda().in(SysOrg::getId, orgIds);
         }
 
         return this.list(queryWrapper);