|
|
@@ -19,7 +19,6 @@ import com.qmth.teachcloud.common.mapper.SysOrgMapper;
|
|
|
import com.qmth.teachcloud.common.service.SysOrgService;
|
|
|
import com.qmth.teachcloud.common.service.SysRoleService;
|
|
|
import com.qmth.teachcloud.common.service.SysUserService;
|
|
|
-import com.qmth.teachcloud.common.service.TeachcloudCommonService;
|
|
|
import com.qmth.teachcloud.common.util.ResultUtil;
|
|
|
import com.qmth.teachcloud.common.util.ServletUtil;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
@@ -52,9 +51,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|
|
@Resource
|
|
|
SysOrgMapper sysOrgMapper;
|
|
|
|
|
|
- @Resource
|
|
|
- TeachcloudCommonService teachcloudCommonService;
|
|
|
-
|
|
|
// @Resource
|
|
|
// BasicCampusService basicCampusService;
|
|
|
|
|
|
@@ -347,27 +343,31 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum, Long orgId, boolean auth) {
|
|
|
- Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
|
- Set<Long> orgIds = new HashSet<>(); // 下级机构集合
|
|
|
- Set<Long> authOrgIdSet = new HashSet<>(); // 当前用户数据权限下的机构集合
|
|
|
- Set<Long> orgIdSet = new HashSet<>(); // 输入机构下的所有下级机构集合
|
|
|
- if (auth) {
|
|
|
- authOrgIdSet = teachcloudCommonService.listSubOrgIds(null);
|
|
|
- }
|
|
|
- if (SystemConstant.longNotNull(orgId)) {
|
|
|
- orgIdSet = teachcloudCommonService.listSubOrgIds(orgId);
|
|
|
- }
|
|
|
- orgIds.addAll(authOrgIdSet);
|
|
|
- orgIds.addAll(orgIdSet);
|
|
|
- QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId)
|
|
|
- .eq(SysOrg::getType, orgTypeEnum)
|
|
|
- .eq(SysOrg::getEnable, true);
|
|
|
- if (orgIds.size() > 0) {
|
|
|
- queryWrapper.lambda().in(SysOrg::getId, orgIds);
|
|
|
- }
|
|
|
- return this.list(queryWrapper);
|
|
|
+ public List<SysOrg> findDeepByOrgIdAndType() {
|
|
|
+ SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
+ return sysOrgMapper.findByConnectByRootOrgIdAndFilter(sysUser.getOrgId(), true);
|
|
|
+// Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
|
+// Set<Long> orgIds = new HashSet<>(); // 下级机构集合
|
|
|
+// Set<Long> authOrgIdSet = new HashSet<>(); // 当前用户数据权限下的机构集合
|
|
|
+// Set<Long> orgIdSet = new HashSet<>(); // 输入机构下的所有下级机构集合
|
|
|
+// if (auth) {
|
|
|
+// authOrgIdSet = teachcloudCommonService.listSubOrgIds(null);
|
|
|
+// }
|
|
|
+// if (SystemConstant.longNotNull(orgId)) {
|
|
|
+// orgIdSet = teachcloudCommonService.listSubOrgIds(orgId);
|
|
|
+// }
|
|
|
+// orgIds.addAll(authOrgIdSet);
|
|
|
+// orgIds.addAll(orgIdSet);
|
|
|
+// QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
|
|
|
+// queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId);
|
|
|
+// if (Objects.nonNull(orgTypeEnum)) {
|
|
|
+// queryWrapper.lambda().eq(SysOrg::getType, orgTypeEnum);
|
|
|
+// }
|
|
|
+// queryWrapper.lambda().eq(SysOrg::getEnable, true);
|
|
|
+// if (orgIds.size() > 0) {
|
|
|
+// queryWrapper.lambda().in(SysOrg::getId, orgIds);
|
|
|
+// }
|
|
|
+// return this.list(queryWrapper);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -400,8 +400,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|
|
for (String orgInfo : orgInfoList) {
|
|
|
// 父机构id
|
|
|
Long schoolId = requestUser.getSchoolId();
|
|
|
- List<SysOrg> topLevelOrg = this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId,schoolId).eq(SysOrg::getType,OrgTypeEnum.SCHOOL));
|
|
|
- if (topLevelOrg.size() != 1){
|
|
|
+ List<SysOrg> topLevelOrg = this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getType, OrgTypeEnum.SCHOOL));
|
|
|
+ if (topLevelOrg.size() != 1) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("顶级机构信息获取异常");
|
|
|
}
|
|
|
Long parentId = topLevelOrg.get(0).getId();
|
wangliang