From f6c0b3aae91430d0faf5d7aa88bbad033b05c47b Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Tue, 11 Mar 2025 20:13:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E6=A0=A1=E8=80=81?= =?UTF-8?q?=E5=B8=88=E5=AD=A6=E7=A7=91=E6=9F=A5=E8=AF=A2=E4=B8=8Bdormitory?= =?UTF-8?q?IdList=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CeesWaiTeacherServiceImpl.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java index a69c4f45..574fc1f7 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java @@ -77,18 +77,20 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); IPage pageList = page(page, queryWrapper); Set dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet()); - LambdaQueryWrapper dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).eq(CeesDormitoryInfo::getId, dormitoryIdList); - List 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 dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).in(CeesDormitoryInfo::getId, dormitoryIdList); + List 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; }