|
@@ -576,7 +576,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
}
|
|
|
List<SysOrg> sysOrgList = sysOrgService.findByConnectByRootOrgId(basicCourse.getTeachingRoomId());
|
|
|
Set<Long> orgIds = sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toSet());
|
|
|
- return sysUserService.filterFlowPrivilege(schoolId, orgIds, true, FlowApproveNameEnum.DIRECTOR);
|
|
|
+ List<ApproveUserResult> approveUserResultList = sysUserService.filterFlowPrivilege(schoolId, orgIds, true, FlowApproveNameEnum.DIRECTOR);
|
|
|
+ if (Objects.isNull(approveUserResultList) || approveUserResultList.size() == 0) {
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("该课程未配置主任审批人");
|
|
|
+ }
|
|
|
+ return approveUserResultList;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -593,7 +597,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
sysOrgSet.addAll(sysOrgService.findByConnectByParentId(l));
|
|
|
}
|
|
|
Set<Long> orgIdsSet = sysOrgSet.stream().map(s -> s.getId()).collect(Collectors.toSet());
|
|
|
- return sysUserService.filterFlowPrivilege(schoolId, orgIdsSet, true, FlowApproveNameEnum.PRESIDENT);
|
|
|
+ List<ApproveUserResult> approveUserResultList = sysUserService.filterFlowPrivilege(schoolId, orgIdsSet, true, FlowApproveNameEnum.PRESIDENT);
|
|
|
+ if (Objects.isNull(approveUserResultList) || approveUserResultList.size() == 0) {
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("未配置院长审批人");
|
|
|
+ }
|
|
|
+ return approveUserResultList;
|
|
|
}
|
|
|
|
|
|
/**
|