From 7d21bb5dd95f3db96b5c2ffe2926d3f5716eaf5d Mon Sep 17 00:00:00 2001
From: Qi <3194726156@qq.com>
Date: Tue, 10 Jun 2025 11:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E4=BD=8F=E5=AE=BF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A6=81=E4=BD=8F=E5=AE=BF=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/service/impl/CeesDormitoryInfoServiceImpl.java      | 1 -
 .../jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java
index 1ec02f3b..d066981d 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java
@@ -139,7 +139,6 @@ public class CeesDormitoryInfoServiceImpl extends ServiceImpl<CeesDormitoryInfoM
         // 直接查询外校老师表中住在该宿舍的老师
         LambdaQueryWrapper<CeesWaiTeacher> query = new LambdaQueryWrapper<>();
         query.eq(CeesWaiTeacher::getDormitoryId, dormitoryId)
-                .eq(CeesWaiTeacher::getDormitoryStatus, 1) // 1表示已住宿
                 .select(CeesWaiTeacher::getUserName); // 只查询用户名字段
         List<CeesWaiTeacher> residents = ceesWaiTeacherMapper.selectList(query);
         // 提取用户名列表
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 41550504..afca3cee 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
@@ -82,7 +82,7 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
         // 宿舍信息数据更新
         if (result == 1 ) {
             // 处理新宿舍分配（dormitoryId为"未分配"时设置为null）
-            String actualDormitoryId = "不分配宿舍".equals(dormitoryId) ? null : dormitoryId;
+            String actualDormitoryId = "".equals(dormitoryId) ? null : dormitoryId;
 
             if (actualDormitoryId != null) {
                 ceesDormitoryInfo = ceesDormitoryInfoMapper.selectById(actualDormitoryId);