From 0b27a5cb423212acbf64f84ebf82e97f473b94f1 Mon Sep 17 00:00:00 2001
From: Qi <3194726156@qq.com>
Date: Sun, 8 Jun 2025 21:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=96=E6=A0=A1=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E5=AE=BF=E8=88=8D=E3=80=81=E5=88=86=E7=BB=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CeesWaiTeacherServiceImpl.java       | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

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 be648aea..4e7614b4 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
@@ -121,8 +121,43 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
      */
     @Override
     public IPage<CeesWaiTeacher> queryPageList(CeesWaiTeacher ceesWaiTeacher, Integer pageNo, Integer pageSize, HttpServletRequest req) {
-
+        // 1. 从请求中获取 dormitoryName 参数值
+        String dormitoryName = req.getParameter("dormitoryName");
+        String groupName = req.getParameter("groupName");
         QueryWrapper<CeesWaiTeacher> queryWrapper = QueryGenerator.initQueryWrapper(ceesWaiTeacher, req.getParameterMap());
+        // 3. 处理 dormitoryName 模糊查询逻辑
+        if (StringUtils.isNotBlank(dormitoryName)) {
+            // 3.1 先查询匹配的宿舍ID列表
+            LambdaQueryWrapper<CeesDormitoryInfo> dormWrapper = Wrappers.lambdaQuery();
+            dormWrapper.like(CeesDormitoryInfo::getDormitory, dormitoryName);
+            List<String> dormitoryIds = ceesDormitoryInfoMapper.selectList(dormWrapper)
+                    .stream()
+                    .map(CeesDormitoryInfo::getId)
+                    .collect(Collectors.toList());
+
+            // 3.2 添加宿舍ID查询条件
+            if (!dormitoryIds.isEmpty()) {
+                queryWrapper.in("dormitory_id", dormitoryIds);
+            } else {
+                // 无匹配宿舍时返回空结果
+                queryWrapper.isNull("dormitory_id"); // 或 .eq("1", "0")
+            }
+        }
+        // 3. 处理 groupName 模糊查询
+        if (StringUtils.isNotBlank(groupName)) {
+            LambdaQueryWrapper<CeesGroup> groupWrapper = Wrappers.lambdaQuery();
+            groupWrapper.like(CeesGroup::getName, groupName);
+            List<String> groupIds = ceesGroupMapper.selectList(groupWrapper)
+                    .stream()
+                    .map(CeesGroup::getId)
+                    .collect(Collectors.toList());
+
+            if (!groupIds.isEmpty()) {
+                queryWrapper.in("group_id", groupIds);
+            } else {
+                queryWrapper.isNull("group_id");
+            }
+        }
 
         Page<CeesWaiTeacher> page = new Page<>(pageNo, pageSize);
         IPage<CeesWaiTeacher> pageList = page(page, queryWrapper);