修改外校老师学科查询下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);
|
||||
IPage<CeesWaiTeacher> pageList = page(page, queryWrapper);
|
||||
Set<String> dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet());
|
||||
LambdaQueryWrapper<CeesDormitoryInfo> dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).eq(CeesDormitoryInfo::getId, dormitoryIdList);
|
||||
List<CeesDormitoryInfo> ceesDormitoryInfos = ceesDormitoryInfoMapper.selectList(dormitoryWrapper);
|
||||
pageList.convert(e->{
|
||||
e.setDormitoryName(ceesDormitoryInfos
|
||||
.stream()
|
||||
.filter(dormitoryInfo -> dormitoryInfo.getId().equals(e.getDormitoryId()))
|
||||
.findFirst()
|
||||
.orElse(new CeesDormitoryInfo())
|
||||
.getDormitory());
|
||||
e.setMajorIdDescription(MajorEnum.describe(e.getMajorId()));
|
||||
return e;
|
||||
});;
|
||||
if (dormitoryIdList.size() > 0) {
|
||||
LambdaQueryWrapper<CeesDormitoryInfo> dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).in(CeesDormitoryInfo::getId, dormitoryIdList);
|
||||
List<CeesDormitoryInfo> ceesDormitoryInfos = ceesDormitoryInfoMapper.selectList(dormitoryWrapper);
|
||||
pageList.convert(e->{
|
||||
e.setDormitoryName(ceesDormitoryInfos
|
||||
.stream()
|
||||
.filter(dormitoryInfo -> dormitoryInfo.getId().equals(e.getDormitoryId()))
|
||||
.findFirst()
|
||||
.orElse(new CeesDormitoryInfo())
|
||||
.getDormitory());
|
||||
e.setMajorIdDescription(MajorEnum.describe(e.getMajorId()));
|
||||
return e;
|
||||
});
|
||||
}
|
||||
return pageList;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue