From a92fdf126e818814de1858c0275cde5091eb42d6 Mon Sep 17 00:00:00 2001
From: Xubx <1827135378@qq.com>
Date: Mon, 19 May 2025 15:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E5=88=86=E9=85=8D=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9A=E5=8F=AA=E8=83=BD=E5=88=86=E9=85=8D=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=AD=A6=E7=A7=91=E7=9A=84=E5=AE=BF=E8=88=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/contoller/CeesDormitoryInfoController.java | 4 ++--
 .../org/jeecg/modules/service/ICeesDormitoryInfoService.java | 2 +-
 .../modules/service/impl/CeesDormitoryInfoServiceImpl.java   | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java
index c5a861f9..2fb78b63 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java
@@ -96,8 +96,8 @@ public class CeesDormitoryInfoController extends JeecgController<CeesDormitoryIn
 	  * @return
 	  */
 	@RequestMapping(value = "/selectBySex")
-	public Result<JSONArray> selectBySex(@RequestParam(name="sex",required=true) String sex) {
-		return ceesDormitoryInfoService.selectBySex(sex);
+	public Result<JSONArray> selectBySex(@RequestParam(name="sex",required=true) String sex, @RequestParam(name="majorId") Integer majorId) {
+		return ceesDormitoryInfoService.selectBySex(sex, majorId);
 	}
 	/**
 	 *   通过id删除
diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java
index e2ba2ce9..ed12605d 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface ICeesDormitoryInfoService extends IService<CeesDormitoryInfo> {
 
-    Result<JSONArray> selectBySex(String sex);
+    Result<JSONArray> selectBySex(String sex, Integer majorId);
 
     IPage<CeesDormitoryInfo> queryPageList(CeesDormitoryInfo ceesDormitoryInfo, Integer pageNo, Integer pageSize, HttpServletRequest req);
 }
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 f32f9959..594f2213 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
@@ -46,7 +46,7 @@ public class CeesDormitoryInfoServiceImpl extends ServiceImpl<CeesDormitoryInfoM
     SysUserRoleMapper sysUserRoleMapper;
 
     @Override
-    public Result<JSONArray> selectBySex(String sex) {
+    public Result<JSONArray> selectBySex(String sex, Integer majorId) {
         //todo: 未添加宿舍满员的情况和宿舍是否正常使用
         Integer type = Integer.parseInt(sex);
         LambdaQueryWrapper<CeesDormitoryInfo> wrapper = new LambdaQueryWrapper<>();
@@ -54,6 +54,9 @@ public class CeesDormitoryInfoServiceImpl extends ServiceImpl<CeesDormitoryInfoM
         if (sex != null) {
             wrapper.eq(CeesDormitoryInfo::getDormitoryType, type);
         }
+        if (majorId != null) {
+            wrapper.eq(CeesDormitoryInfo::getMajorId, majorId);
+        }
         List<CeesDormitoryInfo> list = ceesDormitoryInfoMapper.selectList(wrapper);
         JSONArray resultArray = new JSONArray();
         for (CeesDormitoryInfo dorm : list) {