修改外校老师学科查询下dormitoryIdList为空时的异常
This commit is contained in:
parent
6cfee7359b
commit
f6c0b3aae9
|
@ -77,18 +77,20 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
|
||||||
Page<CeesWaiTeacher> page = new Page<>(pageNo, pageSize);
|
Page<CeesWaiTeacher> page = new Page<>(pageNo, pageSize);
|
||||||
IPage<CeesWaiTeacher> pageList = page(page, queryWrapper);
|
IPage<CeesWaiTeacher> pageList = page(page, queryWrapper);
|
||||||
Set<String> dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet());
|
Set<String> dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet());
|
||||||
LambdaQueryWrapper<CeesDormitoryInfo> dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).eq(CeesDormitoryInfo::getId, dormitoryIdList);
|
if (dormitoryIdList.size() > 0) {
|
||||||
List<CeesDormitoryInfo> ceesDormitoryInfos = ceesDormitoryInfoMapper.selectList(dormitoryWrapper);
|
LambdaQueryWrapper<CeesDormitoryInfo> dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).in(CeesDormitoryInfo::getId, dormitoryIdList);
|
||||||
pageList.convert(e->{
|
List<CeesDormitoryInfo> ceesDormitoryInfos = ceesDormitoryInfoMapper.selectList(dormitoryWrapper);
|
||||||
e.setDormitoryName(ceesDormitoryInfos
|
pageList.convert(e->{
|
||||||
.stream()
|
e.setDormitoryName(ceesDormitoryInfos
|
||||||
.filter(dormitoryInfo -> dormitoryInfo.getId().equals(e.getDormitoryId()))
|
.stream()
|
||||||
.findFirst()
|
.filter(dormitoryInfo -> dormitoryInfo.getId().equals(e.getDormitoryId()))
|
||||||
.orElse(new CeesDormitoryInfo())
|
.findFirst()
|
||||||
.getDormitory());
|
.orElse(new CeesDormitoryInfo())
|
||||||
e.setMajorIdDescription(MajorEnum.describe(e.getMajorId()));
|
.getDormitory());
|
||||||
return e;
|
e.setMajorIdDescription(MajorEnum.describe(e.getMajorId()));
|
||||||
});;
|
return e;
|
||||||
|
});
|
||||||
|
}
|
||||||
return pageList;
|
return pageList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue