|
|
@@ -172,7 +172,7 @@ public class CommonServiceImpl implements CommonService {
|
|
|
authBean = new AuthBean(sysRoleList, sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
|
|
|
} else {
|
|
|
BasicSchool tbSchool = cacheService.schoolCache(user.getSchoolId());
|
|
|
- SysOrg org = cacheService.orgCache(user.getOrgId());
|
|
|
+ SysOrg org = Objects.nonNull(user.getOrgId()) ? cacheService.orgCache(user.getOrgId()) : null;
|
|
|
sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
|
|
|
.eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
|
|
|
List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
|
|
|
@@ -508,7 +508,7 @@ public class CommonServiceImpl implements CommonService {
|
|
|
if (examTask != null && examTask.getStatus().name().equals(ExamStatusEnum.FINISH.name())) {
|
|
|
// 2.校验考务数据是否导入
|
|
|
List<ExamDetail> examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
|
|
|
- if (examDetails!= null && examDetails.size() > 0) {
|
|
|
+ if (examDetails != null && examDetails.size() > 0) {
|
|
|
// 3.检查examDetailId下有无其它课程
|
|
|
for (ExamDetail examDetail : examDetails) {
|
|
|
List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listByExamDetailId(examDetail.getId());
|
wangliang