|
@@ -301,12 +301,9 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|
|
|
|
|
@Override
|
|
|
public List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum) {
|
|
|
- Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
|
|
|
- List<SysOrg> sysOrgList = new ArrayList<>();
|
|
|
- if (orgIds.size() > 0) {
|
|
|
- sysOrgList = this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getType, orgTypeEnum).eq(SysOrg::getEnable, true)
|
|
|
- .in(SysOrg::getId, orgIds));
|
|
|
- }
|
|
|
- return sysOrgList;
|
|
|
+ Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
|
+
|
|
|
+ return this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getType, orgTypeEnum).eq(SysOrg::getEnable, true)
|
|
|
+ .in(SysOrg::getSchoolId, schoolId));
|
|
|
}
|
|
|
}
|