|
@@ -472,6 +472,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|
}
|
|
}
|
|
SysOrg result = null;
|
|
SysOrg result = null;
|
|
List<SysOrg> orgList = this.findParentsByOrgId(orgId).stream().distinct().collect(Collectors.toList());
|
|
List<SysOrg> orgList = this.findParentsByOrgId(orgId).stream().distinct().collect(Collectors.toList());
|
|
|
|
+ // 加上自己
|
|
|
|
+ orgList.add(this.getById(orgId));
|
|
List<SysOrg> schoolOrgList = orgList.stream().filter(e -> OrgTypeEnum.SCHOOL.equals(e.getType())).collect(Collectors.toList());
|
|
List<SysOrg> schoolOrgList = orgList.stream().filter(e -> OrgTypeEnum.SCHOOL.equals(e.getType())).collect(Collectors.toList());
|
|
if (schoolOrgList.size() == 1) {
|
|
if (schoolOrgList.size() == 1) {
|
|
SysOrg schoolOrg = schoolOrgList.get(0);
|
|
SysOrg schoolOrg = schoolOrgList.get(0);
|