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<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;
     }