diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java
index 38fbd29e..89087eeb 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java
@@ -41,29 +41,30 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus<CwApprovalRecord,
      * @param nodeStatus 节点状态
      * @return 审批记录列表
      */
-    List<CwApprovalRecordVo> selectPendingByApproverId(@Param("approverId") Long approverId, @Param("nodeStatus") String nodeStatus);
+    List<CwApprovalRecordVo> selectPendingByApproverId(@Param("approverId") Long approverId,
+            @Param("nodeStatus") String nodeStatus);
 
     /**
      * 根据审批人ID和节点编码查询审批记录
      *
      * @param approverId 审批人ID
-     * @param nodeCode 节点编码
+     * @param nodeCode   节点编码
      * @param nodeStatus 节点状态
      * @return 审批记录列表
      */
     List<CwApprovalRecordVo> selectByApproverAndNode(@Param("approverId") Long approverId,
-                                                     @Param("nodeCode") String nodeCode,
-                                                     @Param("nodeStatus") String nodeStatus);
+            @Param("nodeCode") String nodeCode,
+            @Param("nodeStatus") String nodeStatus);
 
     /**
      * 根据节点编码查询审批记录
      *
-     * @param nodeCode 节点编码
+     * @param nodeCode   节点编码
      * @param nodeStatus 节点状态
      * @return 审批记录列表
      */
     List<CwApprovalRecordVo> selectByNode(@Param("nodeCode") String nodeCode,
-                                          @Param("nodeStatus") String nodeStatus);
+            @Param("nodeStatus") String nodeStatus);
 
     /**
      * 查询财务审批节点的待审批记录（包含waiting和pending状态）
@@ -91,11 +92,11 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus<CwApprovalRecord,
      * 根据申报ID和节点编码查询审批记录
      *
      * @param applicationId 申报ID
-     * @param nodeCode 节点编码
+     * @param nodeCode      节点编码
      * @return 审批记录
      */
     CwApprovalRecordVo selectByApplicationAndNode(@Param("applicationId") Long applicationId,
-                                                  @Param("nodeCode") String nodeCode);
+            @Param("nodeCode") String nodeCode);
 
     /**
      * 根据申报ID删除审批记录
@@ -109,11 +110,11 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus<CwApprovalRecord,
      * 查询当前审批节点记录
      *
      * @param applicationId 申报ID
-     * @param nodeStatus 节点状态
+     * @param nodeStatus    节点状态
      * @return 当前审批节点记录
      */
     CwApprovalRecordVo selectCurrentApprovalNode(@Param("applicationId") Long applicationId,
-                                                 @Param("nodeStatus") String nodeStatus);
+            @Param("nodeStatus") String nodeStatus);
 
     /**
      * 批量插入审批记录
@@ -127,7 +128,7 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus<CwApprovalRecord,
      * 分页查询审批记录（支持关联查询）
      *
      * @param page 分页参数
-     * @param bo 查询条件
+     * @param bo   查询条件
      * @return 分页结果
      */
     IPage<CwApprovalRecordVo> selectPageWithJoin(IPage<CwApprovalRecordVo> page, @Param("bo") CwApprovalRecordBo bo);
@@ -140,4 +141,12 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus<CwApprovalRecord,
      */
     CwApprovalRecordVo selectByIdWithJoin(@Param("id") Long id);
 
+    /**
+     * 查询具有院领导审批权限的用户列表
+     * 查找具有 'cw:approval:leader' 权限的用户
+     *
+     * @return 可选审批人列表
+     */
+    List<java.util.Map<String, Object>> selectAvailableApprovers();
+
 }
diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
index f522adfd..84f2b634 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
@@ -37,7 +37,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 import org.dromara.common.core.utils.SpringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
  * 审批记录Service业务层处理
@@ -56,9 +55,6 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
     private final ISysUserService sysUserService;
     private final ISysDeptService sysDeptService;
 
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
     /**
      * 根据主键查询审批记录
      */
@@ -90,7 +86,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
      */
     @Override
     public TableDataInfo<CwApprovalRecordVo> queryPageList(CwApprovalRecordBo bo, PageQuery pageQuery) {
-        log.info("🔍 开始查询审批记录，查询参数：deptId={}, pageNum={}, pageSize={}", bo.getDeptId(), pageQuery.getPageNum(), pageQuery.getPageSize());
+        log.info("🔍 开始查询审批记录，查询参数：deptId={}, pageNum={}, pageSize={}", bo.getDeptId(), pageQuery.getPageNum(),
+                pageQuery.getPageSize());
 
         // 🔧 使用新的关联查询方法（支持完整字段显示）
         Page<CwApprovalRecordVo> page = pageQuery.build();
@@ -167,7 +164,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
                 for (int i = 0; i < Math.min(result.getRecords().size(), 2); i++) {
                     CwApprovalRecordVo record = result.getRecords().get(i);
                     log.info("📋 记录{}详情：id={}, 申报编号={}, 项目名称={}, 申报人={}, 部门={}, 总投资={}, 当前审批人={}, 状态={}",
-                            i+1, record.getId(), record.getApplicationNo(), record.getProjectName(),
+                            i + 1, record.getId(), record.getApplicationNo(), record.getProjectName(),
                             record.getApplicantName(), record.getDeptName(), record.getTotalInvestment(),
                             record.getCurrentApproverName(), record.getApprovalStatus());
                 }
@@ -196,7 +193,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
     private LambdaQueryWrapper<CwApprovalRecord> buildQueryWrapper(CwApprovalRecordBo bo) {
         LambdaQueryWrapper<CwApprovalRecord> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getApplicationId() != null, CwApprovalRecord::getApplicationId, bo.getApplicationId());
-        lqw.eq(StringUtils.isNotBlank(bo.getApplicationNo()), CwApprovalRecord::getApplicationNo, bo.getApplicationNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getApplicationNo()), CwApprovalRecord::getApplicationNo,
+                bo.getApplicationNo());
         lqw.eq(StringUtils.isNotBlank(bo.getNodeCode()), CwApprovalRecord::getNodeCode, bo.getNodeCode());
         lqw.eq(StringUtils.isNotBlank(bo.getNodeStatus()), CwApprovalRecord::getNodeStatus, bo.getNodeStatus());
         lqw.eq(bo.getApproverId() != null, CwApprovalRecord::getApproverId, bo.getApproverId());
@@ -212,7 +210,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
                 if (currentDeptId != null) {
                     // 查询该部门的项目申报ID列表
                     lqw.inSql(CwApprovalRecord::getApplicationId,
-                        "SELECT id FROM cw_project_application WHERE department_id = " + currentDeptId + " AND deleted = 0");
+                            "SELECT id FROM cw_project_application WHERE department_id = " + currentDeptId
+                                    + " AND deleted = 0");
 
                     // 只显示部门审批节点的记录
                     lqw.eq(CwApprovalRecord::getNodeCode, "dept_approve");
@@ -234,7 +233,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
                 try {
                     Long deptId = Long.valueOf(bo.getDeptId());
                     lqw.in(CwApprovalRecord::getApplicationId,
-                        "SELECT id FROM cw_project_application WHERE department_id = " + deptId + " AND deleted = 0");
+                            "SELECT id FROM cw_project_application WHERE department_id = " + deptId
+                                    + " AND deleted = 0");
                 } catch (NumberFormatException e) {
                     log.warn("无效的部门ID格式：{}", bo.getDeptId());
                 }
@@ -245,11 +245,11 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
 
         // 其他查询条件 - 暂时注释掉，避免复杂的关联查询导致编译错误
         // if (StringUtils.isNotBlank(bo.getProjectName())) {
-        //     // 项目名称查询需要关联查询，暂时跳过
+        // // 项目名称查询需要关联查询，暂时跳过
         // }
 
         // if (StringUtils.isNotBlank(bo.getApplicantName())) {
-        //     // 申报人姓名查询需要关联查询，暂时跳过
+        // // 申报人姓名查询需要关联查询，暂时跳过
         // }
 
         if (StringUtils.isNotBlank(bo.getApproverName())) {
@@ -304,8 +304,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
                 if (deptId != null) {
                     // 通过关联查询，只显示本部门用户提交的申报对应的审批记录
                     lqw.exists("SELECT 1 FROM cw_project_application a " +
-                             "WHERE a.id = cw_approval_record.application_id " +
-                             "AND a.department_id = " + deptId);
+                            "WHERE a.id = cw_approval_record.application_id " +
+                            "AND a.department_id = " + deptId);
                     // 🔧 关键修复：部门领导也需要过滤为自己作为审批人的记录
                     lqw.eq(CwApprovalRecord::getApproverId, currentUserId);
                     log.debug("部门领导权限过滤完成：deptId={}, approverId={}", deptId, currentUserId);
@@ -383,8 +383,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
             // 查询当前用户已审批的记录（精确匹配已完成的状态）
             LambdaQueryWrapper<CwApprovalRecord> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.eq(CwApprovalRecord::getApproverId, currentUserId)
-                       .in(CwApprovalRecord::getNodeStatus, Arrays.asList("approved", "rejected", "returned"))
-                       .orderByDesc(CwApprovalRecord::getEndTime);
+                    .in(CwApprovalRecord::getNodeStatus, Arrays.asList("approved", "rejected", "returned"))
+                    .orderByDesc(CwApprovalRecord::getEndTime);
 
             return baseMapper.selectList(queryWrapper);
         });
@@ -544,8 +544,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
     @Override
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     public Boolean createApprovalProcess(Long applicationId, String applicationNo,
-                                         Long currentUserId, String currentUserName,
-                                         Long currentDeptId, String currentTenantId) {
+            Long currentUserId, String currentUserName,
+            Long currentDeptId, String currentTenantId) {
         log.info("🚀 开始创建审批流程：applicationId={}, applicationNo={}", applicationId, applicationNo);
         log.info("📋 使用用户上下文：userId={}, userName={}, deptId={}, tenantId={}",
                 currentUserId, currentUserName, currentDeptId, currentTenantId);
@@ -565,15 +565,15 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
                 log.error("❌ 申报记录不存在：applicationId={}", applicationId);
                 throw new RuntimeException("申报记录不存在");
             }
-            log.info("✅ 成功获取申报信息：projectName={}, status={}", application.getProjectName(), application.getApprovalStatus());
+            log.info("✅ 成功获取申报信息：projectName={}, status={}", application.getProjectName(),
+                    application.getApprovalStatus());
 
             // 🔧 重要修复：清理该申报的旧审批记录（避免重复数据）
             log.info("🧹 开始清理申报ID={}的旧审批记录...", applicationId);
             try {
                 int deletedCount = baseMapper.delete(
-                    Wrappers.<CwApprovalRecord>lambdaQuery()
-                        .eq(CwApprovalRecord::getApplicationId, applicationId)
-                );
+                        Wrappers.<CwApprovalRecord>lambdaQuery()
+                                .eq(CwApprovalRecord::getApplicationId, applicationId));
                 log.info("✅ 清理旧审批记录完成：删除{}条记录", deletedCount);
             } catch (Exception e) {
                 log.error("❌ 清理旧审批记录失败：applicationId={}, error={}", applicationId, e.getMessage(), e);
@@ -587,8 +587,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
 
             // 第1节点：部门审批（提交时只创建这一个记录）
             CwApprovalRecord deptRecord = createApprovalRecord(applicationId, applicationNo,
-                "dept_approve", "部门审批", 1, "waiting",
-                currentUserId, currentUserName, currentDeptId, currentTenantId);
+                    "dept_approve", "部门审批", 1, "waiting",
+                    currentUserId, currentUserName, currentDeptId, currentTenantId);
             records.add(deptRecord);
             log.info("✅ 创建部门审批记录：ID={}, 审批人={}", deptRecord.getId(), deptRecord.getApproverName());
 
@@ -602,8 +602,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
             for (int i = 0; i < records.size(); i++) {
                 CwApprovalRecord record = records.get(i);
                 log.info("📋 记录{}详情: ID={}, ApplicationId={}, NodeCode={}, ApproverId={}, CreateBy={}, TenantId={}",
-                    i+1, record.getId(), record.getApplicationId(), record.getNodeCode(),
-                    record.getApproverId(), record.getCreateBy(), record.getTenantId());
+                        i + 1, record.getId(), record.getApplicationId(), record.getNodeCode(),
+                        record.getApproverId(), record.getCreateBy(), record.getTenantId());
             }
 
             // 批量插入审批记录
@@ -626,11 +626,10 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
                 try {
                     // 直接使用Mapper在当前事务中更新，避免调用Service层的新事务
                     int updateCount = applicationMapper.update(null,
-                        Wrappers.<CwProjectApplication>lambdaUpdate()
-                            .set(CwProjectApplication::getApprovalStatus, "approving")
-                            .set(CwProjectApplication::getUpdateTime, new Date())
-                            .eq(CwProjectApplication::getId, applicationId)
-                    );
+                            Wrappers.<CwProjectApplication>lambdaUpdate()
+                                    .set(CwProjectApplication::getApprovalStatus, "approving")
+                                    .set(CwProjectApplication::getUpdateTime, new Date())
+                                    .eq(CwProjectApplication::getId, applicationId));
 
                     if (updateCount > 0) {
                         log.info("✅ 申报状态直接更新成功：applicationId={} -> approving, 影响行数={}", applicationId, updateCount);
@@ -673,10 +672,10 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
     }
 
     private CwApprovalRecord createApprovalRecord(Long applicationId, String applicationNo,
-                                                  String nodeCode, String nodeName,
-                                                  Integer nodeOrder, String nodeStatus,
-                                                  Long currentUserId, String currentUserName,
-                                                  Long currentDeptId, String currentTenantId) {
+            String nodeCode, String nodeName,
+            Integer nodeOrder, String nodeStatus,
+            Long currentUserId, String currentUserName,
+            Long currentDeptId, String currentTenantId) {
         CwApprovalRecord record = new CwApprovalRecord();
 
         // 生成唯一ID（批量插入需要手动生成）
@@ -709,7 +708,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
         record.setCreateDept(currentDeptId);
         record.setTenantId(currentTenantId);
 
-                // 设置其他必需字段（为批量插入提供完整数据）
+        // 设置其他必需字段（为批量插入提供完整数据）
         record.setIsDelegate(false);
         record.setIsOvertime(false);
 
@@ -748,7 +747,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
      * 根据节点类型设置审批人
      */
     private void setApproverByNodeCode(CwApprovalRecord record, String nodeCode,
-                                       Long currentUserId, String currentUserName) {
+            Long currentUserId, String currentUserName) {
         // 根据审批节点类型查找正确的审批人，而不是使用申报人
         try {
             switch (nodeCode) {
@@ -875,12 +874,12 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
         try {
             // SQL查询：查找该部门内具有project_dept_manage角色的用户
             String sql = "SELECT ur.user_id FROM sys_user_role ur " +
-                        "INNER JOIN sys_role r ON ur.role_id = r.role_id " +
-                        "INNER JOIN sys_user u ON ur.user_id = u.user_id " +
-                        "WHERE r.role_key = 'project_dept_manage' " +
-                        "AND u.dept_id = " + deptId + " " +
-                        "AND u.del_flag = 0 AND u.status = 0 " +
-                        "LIMIT 1";
+                    "INNER JOIN sys_role r ON ur.role_id = r.role_id " +
+                    "INNER JOIN sys_user u ON ur.user_id = u.user_id " +
+                    "WHERE r.role_key = 'project_dept_manage' " +
+                    "AND u.dept_id = " + deptId + " " +
+                    "AND u.del_flag = 0 AND u.status = 0 " +
+                    "LIMIT 1";
 
             log.info("查找部门审批人SQL：{}", sql);
 
@@ -958,8 +957,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
             // 更新当前审批记录
             CwApprovalRecordBo updateBo = new CwApprovalRecordBo();
             updateBo.setId(currentRecord.getId());
-            updateBo.setNodeStatus("approve".equals(approveAction) ? "approved" :
-                                  "reject".equals(approveAction) ? "rejected" : "returned");
+            updateBo.setNodeStatus("approve".equals(approveAction) ? "approved"
+                    : "reject".equals(approveAction) ? "rejected" : "returned");
             updateBo.setApproveAction(approveAction);
             updateBo.setApproveOpinion(approveOpinion);
             updateBo.setEndTime(new Date());
@@ -974,7 +973,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
 
         } catch (Exception e) {
             log.error("处理审批失败：applicationId={}, nodeCode={}, error={}",
-                     applicationId, nodeCode, e.getMessage(), e);
+                    applicationId, nodeCode, e.getMessage(), e);
             throw new RuntimeException("处理审批失败：" + e.getMessage(), e);
         }
     }
@@ -1020,8 +1019,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
 
                 // 根据节点类型创建对应的审批记录
                 CwApprovalRecord newRecord = createApprovalRecordForNode(applicationId, application.getApplicationNo(),
-                    nextNodeCode, application.getCreateBy(), application.getApplicantName(),
-                    application.getDepartmentId(), LoginHelper.getTenantId());
+                        nextNodeCode, application.getCreateBy(), application.getApplicantName(),
+                        application.getDepartmentId(), LoginHelper.getTenantId());
 
                 if (newRecord != null) {
                     // 插入新的审批记录
@@ -1046,7 +1045,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
             return true;
         } catch (Exception e) {
             log.error("启动下一个审批节点失败：applicationId={}, nodeCode={}, error={}",
-                applicationId, nextNodeCode, e.getMessage(), e);
+                    applicationId, nextNodeCode, e.getMessage(), e);
             throw new RuntimeException("启动下一个审批节点失败：" + e.getMessage());
         }
     }
@@ -1055,8 +1054,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
      * 动态创建指定节点的审批记录
      */
     private CwApprovalRecord createApprovalRecordForNode(Long applicationId, String applicationNo,
-                                                        String nodeCode, Long createBy, String createByName,
-                                                        Long deptId, String tenantId) {
+            String nodeCode, Long createBy, String createByName,
+            Long deptId, String tenantId) {
         try {
             String nodeName;
             Integer nodeOrder;
@@ -1077,11 +1076,11 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
 
             // 创建审批记录
             CwApprovalRecord record = createApprovalRecord(applicationId, applicationNo,
-                nodeCode, nodeName, nodeOrder, "waiting",
-                createBy, createByName, deptId, tenantId);
+                    nodeCode, nodeName, nodeOrder, "waiting",
+                    createBy, createByName, deptId, tenantId);
 
             log.info("✅ 动态创建审批记录：nodeCode={}, nodeName={}, approverId={}",
-                nodeCode, nodeName, record.getApproverId());
+                    nodeCode, nodeName, record.getApproverId());
 
             return record;
         } catch (Exception e) {
@@ -1124,7 +1123,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
         return checkApprovalPermission(applicationId, "dept_approve");
     }
 
-        /**
+    /**
      * 获取可选审批人列表（院领导）
      * 修改为基于权限角色查找：查找具有cw:approval:leader权限的用户
      */
@@ -1135,46 +1134,22 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
         List<Map<String, Object>> approvers = new ArrayList<>();
 
         try {
-            // 使用原生SQL查询具有cw:approval:leader权限的用户
-            String sql = """
-                SELECT DISTINCT
-                    u.user_id,
-                    u.user_name,
-                    u.nick_name,
-                    COALESCE(d.dept_name, '未分配部门') as dept_name,
-                    COALESCE(d.dept_id, 0) as dept_id
-                FROM sys_user u
-                LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
-                INNER JOIN sys_user_role ur ON u.user_id = ur.user_id
-                INNER JOIN sys_role r ON ur.role_id = r.role_id
-                INNER JOIN sys_role_menu rm ON r.role_id = rm.role_id
-                INNER JOIN sys_menu m ON rm.menu_id = m.menu_id
-                WHERE m.perms = 'cw:approval:leader'
-                  AND u.status = '0'
-                  AND u.del_flag = '0'
-                  AND r.status = '0'
-                ORDER BY u.user_name
-                """;
+            // 🔧 使用Mapper方法查询具有cw:approval:leader权限的用户
+            log.info("执行Mapper查询查找具有cw:approval:leader权限的用户");
 
-            log.info("执行权限查询SQL查找具有cw:approval:leader权限的用户");
+            // 直接调用Mapper方法，不需要手动转换结果
+            List<Map<String, Object>> results = baseMapper.selectAvailableApprovers();
 
-            // 执行SQL查询
-            List<Map<String, Object>> results = jdbcTemplate.queryForList(sql);
+            log.info("Mapper查询结果：找到 {} 个具有院领导审批权限的用户", results.size());
 
-            log.info("SQL查询结果：找到 {} 个具有院领导审批权限的用户", results.size());
-
-            // 转换查询结果为返回格式
-            for (Map<String, Object> row : results) {
-                Map<String, Object> approver = new HashMap<>();
-                approver.put("userId", row.get("user_id"));
-                approver.put("userName", row.get("user_name"));
-                approver.put("nickName", row.get("nick_name"));
-                approver.put("deptName", row.get("dept_name"));
-                approver.put("deptId", row.get("dept_id"));
-                approvers.add(approver);
+            // 直接使用查询结果，Mapper已经处理了字段映射
+            approvers.addAll(results);
 
+            // 记录查询到的审批人信息
+            for (Map<String, Object> approver : approvers) {
                 log.info("添加院领导审批人: userId={}, userName={}, nickName={}, deptName={}",
-                        row.get("user_id"), row.get("user_name"), row.get("nick_name"), row.get("dept_name"));
+                        approver.get("userId"), approver.get("userName"), approver.get("nickName"),
+                        approver.get("deptName"));
             }
 
             // 如果基于权限查询没有找到用户，使用原有的部门查询作为备选方案
@@ -1230,11 +1205,10 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
 
         // 1. 查找当前用户的待审批记录
         CwApprovalRecord currentRecord = baseMapper.selectOne(
-            Wrappers.lambdaQuery(CwApprovalRecord.class)
-                .eq(CwApprovalRecord::getApplicationId, applicationId)
-                .eq(CwApprovalRecord::getApproverId, currentUserId)
-                .eq(CwApprovalRecord::getNodeStatus, "waiting")
-        );
+                Wrappers.lambdaQuery(CwApprovalRecord.class)
+                        .eq(CwApprovalRecord::getApplicationId, applicationId)
+                        .eq(CwApprovalRecord::getApproverId, currentUserId)
+                        .eq(CwApprovalRecord::getNodeStatus, "waiting"));
 
         if (currentRecord == null) {
             throw new RuntimeException("未找到待审批记录或您没有审批权限");
@@ -1263,7 +1237,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
             throw new RuntimeException("更新审批记录失败");
         }
 
-                // 3. 更新项目申请状态
+        // 3. 更新项目申请状态
         String newStatus;
         if ("approve".equals(approveAction)) {
             // 分管领导审批通过，整个审批流程完成
@@ -1292,7 +1266,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void financeApproval(Long applicationId, String approveAction, String approveOpinion, Long selectedApproverId) {
+    public void financeApproval(Long applicationId, String approveAction, String approveOpinion,
+            Long selectedApproverId) {
         Long currentUserId = LoginHelper.getUserId();
         log.info("🔍 财务审批开始：applicationId={}, userId={}, action={}, selectedApproverId={}",
                 applicationId, currentUserId, approveAction, selectedApproverId);
@@ -1306,24 +1281,22 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
         log.info("🔍 查询财务审批记录：applicationId={}, nodeCode=finance_approve, nodeStatus=waiting", applicationId);
 
         List<CwApprovalRecord> records = baseMapper.selectList(
-            Wrappers.lambdaQuery(CwApprovalRecord.class)
-                .eq(CwApprovalRecord::getApplicationId, applicationId)
-                .eq(CwApprovalRecord::getNodeCode, "finance_approve")
-                .eq(CwApprovalRecord::getNodeStatus, "waiting")
-                .orderByDesc(CwApprovalRecord::getCreateTime)
-        );
+                Wrappers.lambdaQuery(CwApprovalRecord.class)
+                        .eq(CwApprovalRecord::getApplicationId, applicationId)
+                        .eq(CwApprovalRecord::getNodeCode, "finance_approve")
+                        .eq(CwApprovalRecord::getNodeStatus, "waiting")
+                        .orderByDesc(CwApprovalRecord::getCreateTime));
 
         if (records.isEmpty()) {
             log.error("❌ 未找到财务审批记录：applicationId={}", applicationId);
             // 查询所有相关记录用于调试
             List<CwApprovalRecord> allRecords = baseMapper.selectList(
-                Wrappers.lambdaQuery(CwApprovalRecord.class)
-                    .eq(CwApprovalRecord::getApplicationId, applicationId)
-            );
+                    Wrappers.lambdaQuery(CwApprovalRecord.class)
+                            .eq(CwApprovalRecord::getApplicationId, applicationId));
             log.error("📋 该申请的所有审批记录：{}", allRecords.size());
             for (CwApprovalRecord record : allRecords) {
                 log.error("📋 记录详情：nodeCode={}, nodeStatus={}, approverId={}",
-                    record.getNodeCode(), record.getNodeStatus(), record.getApproverId());
+                        record.getNodeCode(), record.getNodeStatus(), record.getApproverId());
             }
             throw new RuntimeException("未找到待审批记录或该申请已被处理");
         }
@@ -1335,7 +1308,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
         }
 
         log.info("✅ 找到财务审批记录：recordId={}, nodeCode={}, nodeStatus={}, approverId={}",
-            currentRecord.getId(), currentRecord.getNodeCode(), currentRecord.getNodeStatus(), currentRecord.getApproverId());
+                currentRecord.getId(), currentRecord.getNodeCode(), currentRecord.getNodeStatus(),
+                currentRecord.getApproverId());
 
         // 3. 更新当前审批记录
         Date now = new Date();
@@ -1392,23 +1366,21 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
     private void updateLeaderApproverAndStart(Long applicationId, Long selectedApproverId) {
         // 1. 查找分管领导审批记录（先按waiting状态查找）
         CwApprovalRecord leaderRecord = baseMapper.selectOne(
-            Wrappers.lambdaQuery(CwApprovalRecord.class)
-                .eq(CwApprovalRecord::getApplicationId, applicationId)
-                .eq(CwApprovalRecord::getNodeCode, "leader_approve")
-                .eq(CwApprovalRecord::getNodeStatus, "waiting")
-        );
+                Wrappers.lambdaQuery(CwApprovalRecord.class)
+                        .eq(CwApprovalRecord::getApplicationId, applicationId)
+                        .eq(CwApprovalRecord::getNodeCode, "leader_approve")
+                        .eq(CwApprovalRecord::getNodeStatus, "waiting"));
 
         // 2. 如果waiting状态未找到，尝试查找pending状态（兼容处理）
         if (leaderRecord == null) {
             leaderRecord = baseMapper.selectOne(
-                Wrappers.lambdaQuery(CwApprovalRecord.class)
-                    .eq(CwApprovalRecord::getApplicationId, applicationId)
-                    .eq(CwApprovalRecord::getNodeCode, "leader_approve")
-                    .eq(CwApprovalRecord::getNodeStatus, "pending")
-            );
+                    Wrappers.lambdaQuery(CwApprovalRecord.class)
+                            .eq(CwApprovalRecord::getApplicationId, applicationId)
+                            .eq(CwApprovalRecord::getNodeCode, "leader_approve")
+                            .eq(CwApprovalRecord::getNodeStatus, "pending"));
         }
 
-                // 3. 如果仍未找到，动态创建分管领导审批记录
+        // 3. 如果仍未找到，动态创建分管领导审批记录
         if (leaderRecord == null) {
             log.warn("未找到分管领导审批记录，开始动态创建：applicationId={}", applicationId);
 
@@ -1426,17 +1398,16 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
 
             // 创建分管领导审批记录
             leaderRecord = createApprovalRecord(
-                applicationId,
-                applicationVo.getApplicationNo(),
-                "leader_approve",
-                "分管领导审批",
-                3, // leader_approve 节点顺序
-                "waiting",
-                currentUserId,
-                currentUserName,
-                currentDeptId,
-                currentTenantId
-            );
+                    applicationId,
+                    applicationVo.getApplicationNo(),
+                    "leader_approve",
+                    "分管领导审批",
+                    3, // leader_approve 节点顺序
+                    "waiting",
+                    currentUserId,
+                    currentUserName,
+                    currentDeptId,
+                    currentTenantId);
 
             // 保存到数据库
             int result = baseMapper.insert(leaderRecord);
@@ -1447,7 +1418,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
             log.info("✅ 动态创建分管领导审批记录成功：recordId={}", leaderRecord.getId());
         }
 
-                // 2. 获取选择的院领导信息
+        // 2. 获取选择的院领导信息
         try {
             SysUserVo selectedUser = sysUserService.selectUserById(selectedApproverId);
             if (selectedUser == null) {
@@ -1470,12 +1441,12 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
                 throw new RuntimeException("更新分管领导审批记录失败");
             }
 
-                        log.info("✅ 成功指定院领导审批人：userId={}, userName={}",
+            log.info("✅ 成功指定院领导审批人：userId={}, userName={}",
                     selectedApproverId, selectedUser.getUserName());
 
         } catch (Exception e) {
             log.error("❌ 更新分管领导审批人失败：applicationId={}, selectedApproverId={}, error={}",
-                     applicationId, selectedApproverId, e.getMessage(), e);
+                    applicationId, selectedApproverId, e.getMessage(), e);
             throw new RuntimeException("指定院领导审批人失败：" + e.getMessage());
         }
     }
diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml b/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml
index 22f49bc6..11e1c691 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml
@@ -234,4 +234,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY ar.create_time DESC
     </select>
 
+    <!-- 查询具有院领导审批权限的用户列表 -->
+    <select id="selectAvailableApprovers" resultType="java.util.Map">
+        SELECT DISTINCT
+            u.user_id as userId,
+            u.user_name as userName,
+            u.nick_name as nickName,
+            COALESCE(d.dept_name, '未分配部门') as deptName,
+            COALESCE(d.dept_id, 0) as deptId
+        FROM sys_user u
+        LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
+        INNER JOIN sys_user_role ur ON u.user_id = ur.user_id
+        INNER JOIN sys_role r ON ur.role_id = r.role_id
+        INNER JOIN sys_role_menu rm ON r.role_id = rm.role_id
+        INNER JOIN sys_menu m ON rm.menu_id = m.menu_id
+        WHERE m.perms = 'cw:approval:leader'
+          AND u.status = '0'
+          AND u.del_flag = '0'
+          AND r.status = '0'
+        ORDER BY u.user_name
+    </select>
+
 </mapper>
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java
index 721b4798..fbf380e7 100644
--- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java
@@ -70,6 +70,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 查询奖学金申请记录详情
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public JcbtScholarshipApplicationVo queryById(Long id) {
         return baseMapper.selectByIdWithRelations(id);
     }
@@ -78,10 +79,13 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 查询奖学金申请记录分页列表
      */
     @Override
-    public TableDataInfo<JcbtScholarshipApplicationVo> queryPageList(JcbtScholarshipApplicationBo bo, PageQuery pageQuery) {
+    @Transactional(rollbackFor = Exception.class)
+    public TableDataInfo<JcbtScholarshipApplicationVo> queryPageList(JcbtScholarshipApplicationBo bo,
+            PageQuery pageQuery) {
         LambdaQueryWrapper<JcbtScholarshipApplication> lqw = buildQueryWrapper(bo);
         // 使用自定义分页查询（包含关联表信息）
-        Page<JcbtScholarshipApplicationVo> result = baseMapper.selectJcbtScholarshipApplicationPage(pageQuery.build(), lqw);
+        Page<JcbtScholarshipApplicationVo> result = baseMapper.selectJcbtScholarshipApplicationPage(pageQuery.build(),
+                lqw);
         return TableDataInfo.build(result);
     }
 
@@ -89,6 +93,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 查询奖学金申请记录列表
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<JcbtScholarshipApplicationVo> queryList(JcbtScholarshipApplicationBo bo) {
         LambdaQueryWrapper<JcbtScholarshipApplication> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
@@ -98,18 +103,21 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<JcbtScholarshipApplication> lqw = Wrappers.lambdaQuery();
         lqw.eq(ObjectUtil.isNotNull(bo.getBatchId()), JcbtScholarshipApplication::getBatchId, bo.getBatchId());
-        lqw.eq(ObjectUtil.isNotNull(bo.getScholarshipTypeId()), JcbtScholarshipApplication::getScholarshipTypeId, bo.getScholarshipTypeId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getScholarshipTypeId()), JcbtScholarshipApplication::getScholarshipTypeId,
+                bo.getScholarshipTypeId());
         lqw.eq(StringUtils.isNotBlank(bo.getStudentNo()), JcbtScholarshipApplication::getStudentNo, bo.getStudentNo());
-        lqw.like(StringUtils.isNotBlank(bo.getStudentName()), JcbtScholarshipApplication::getStudentName, bo.getStudentName());
+        lqw.like(StringUtils.isNotBlank(bo.getStudentName()), JcbtScholarshipApplication::getStudentName,
+                bo.getStudentName());
         lqw.eq(ObjectUtil.isNotNull(bo.getStudentId()), JcbtScholarshipApplication::getStudentId, bo.getStudentId());
         lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), JcbtScholarshipApplication::getDeptId, bo.getDeptId());
         lqw.eq(ObjectUtil.isNotNull(bo.getClassId()), JcbtScholarshipApplication::getClassId, bo.getClassId());
         // 已删除 applicantType 和 applicantId 字段
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JcbtScholarshipApplication::getCurrentStatus, bo.getStatus());
         // 支持前端 applicationStatus 查询参数
-        lqw.eq(StringUtils.isNotBlank(bo.getApplicationStatus()), JcbtScholarshipApplication::getCurrentStatus, bo.getApplicationStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getApplicationStatus()), JcbtScholarshipApplication::getCurrentStatus,
+                bo.getApplicationStatus());
         lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
-            JcbtScholarshipApplication::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+                JcbtScholarshipApplication::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
         // 注意：排序在XML中处理，避免SQL语法错误
         // lqw.orderByDesc(JcbtScholarshipApplication::getCreateTime);
         return lqw;
@@ -122,7 +130,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(JcbtScholarshipApplicationBo bo) {
         // 检查申请资格
-        Map<String, Object> eligibilityCheck = checkStudentEligibility(bo.getStudentId(), bo.getBatchId(), bo.getScholarshipTypeId());
+        Map<String, Object> eligibilityCheck = checkStudentEligibility(bo.getStudentId(), bo.getBatchId(),
+                bo.getScholarshipTypeId());
         if (!(Boolean) eligibilityCheck.get("eligible")) {
             throw new RuntimeException((String) eligibilityCheck.get("message"));
         }
@@ -254,15 +263,14 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean batchSubmitApplicationsByTeacher(Long batchId, Long scholarshipTypeId, Long classId,
-                                                   List<JcbtScholarshipApplicationBo> studentApplications) {
+            List<JcbtScholarshipApplicationBo> studentApplications) {
         // 检查班级名额 - 使用和前端一致的查询方法
         log.info("开始检查班级名额 - 批次ID: {}, 奖学金类型ID: {}, 班级ID: {}, 申请人数: {}",
                 batchId, scholarshipTypeId, classId, studentApplications.size());
 
         // 使用和前端getScholarshipTypesWithQuota一致的查询方法
         JcbtScholarshipQuotaVo classQuota = quotaService.selectClassQuota(classId, scholarshipTypeId, batchId);
-        log.info("班级名额查询结果: {}", classQuota != null ?
-            String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
+        log.info("班级名额查询结果: {}", classQuota != null ? String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
                 classQuota.getId(), classQuota.getTotalQuota(), classQuota.getUsedQuota(),
                 classQuota.getAvailableQuota(), classQuota.getStatus()) : "null");
 
@@ -306,7 +314,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
         if (classQuota != null) {
             // 有班级名额分配，更新班级名额
             log.info("更新班级名额使用情况 - ID: {}, 原已用: {}, 原可用: {}, 新增申请: {}",
-                    classQuota.getId(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(), studentApplications.size());
+                    classQuota.getId(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(),
+                    studentApplications.size());
 
             // 注意：这里需要调用全校名额表的更新方法，而不是班级名额表的方法
             quotaService.updateQuotaUsage(classQuota.getId(), studentApplications.size());
@@ -334,6 +343,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 查询班主任负责班级的申请记录
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<JcbtScholarshipApplicationVo> queryApplicationsByApplicant(Long applicantId, Long batchId) {
         // TODO: 重新设计查询逻辑，因为applicantId字段已删除
         // 可能需要通过班级ID或其他方式查询班主任负责的申请记录
@@ -344,6 +354,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 查询班级的申请记录
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<JcbtScholarshipApplicationVo> queryApplicationsByClass(Long classId, Long batchId) {
         return baseMapper.selectApplicationsByClass(classId, batchId);
     }
@@ -352,6 +363,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 查询待审核的申请记录
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<JcbtScholarshipApplicationVo> queryPendingApplications(Long reviewerId, String status) {
         return baseMapper.selectPendingApplications(reviewerId, status);
     }
@@ -360,6 +372,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 检查学生申请资格和限制
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> checkStudentEligibility(Long studentId, Long batchId, Long scholarshipTypeId) {
         Map<String, Object> result = new HashMap<>();
 
@@ -383,7 +396,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean batchReviewApplications(List<Long> applicationIds, String status, Long reviewerId,
-                                         String reviewerName, String reviewComment) {
+            String reviewerName, String reviewComment) {
         return baseMapper.batchUpdateStatus(applicationIds, status, reviewerId, reviewerName, reviewComment) > 0;
     }
 
@@ -429,6 +442,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 获取申请统计数据
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> getApplicationStatistics(Long batchId, Long deptId) {
         List<JcbtScholarshipApplicationVo> statistics = baseMapper.selectApplicationStatistics(batchId, deptId);
 
@@ -443,6 +457,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 查询可申请的奖学金类型列表
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<Map<String, Object>> queryAvailableScholarshipTypes(Long classId, Long batchId) {
         // 查询该班级在该批次的名额分配情况
         List<JcbtScholarshipClassQuotaVo> quotas = classQuotaService.queryQuotasByClass(classId, batchId);
@@ -466,6 +481,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 获取班级名额使用情况
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> getClassQuotaUsage(Long classId, Long batchId) {
         List<JcbtScholarshipClassQuotaVo> quotas = classQuotaService.queryQuotasByClass(classId, batchId);
 
@@ -485,7 +501,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
 
     // ========== 班主任申请专用接口实现 ==========
 
-        /**
+    /**
      * 根据班主任用户ID获取完整的班级信息
      * 自包含方法，避免跨模块调用，直接使用SQL查询
      */
@@ -493,26 +509,26 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
         try {
             // 使用自定义SQL一次性关联查询所有需要的信息
             String sql = """
-                SELECT
-                    cm.id as class_id,
-                    cm.class_name,
-                    cm.class_code,
-                    cm.grade,
-                    cm.college_id,
-                    cm.college_name,
-                    cm.major_id,
-                    cm.major_name,
-                    cm.class_teacher_id,
-                    cm.class_teacher_name,
-                    cm.current_student_count,
-                    cm.class_status,
-                    cm.class_type
-                FROM xg_class_msg cm
-                WHERE cm.class_teacher_id = ?
-                  AND cm.deleted = 0
-                  AND cm.class_status = '1'
-                ORDER BY cm.grade DESC, cm.class_name ASC
-                """;
+                    SELECT
+                        cm.id as class_id,
+                        cm.class_name,
+                        cm.class_code,
+                        cm.grade,
+                        cm.college_id,
+                        cm.college_name,
+                        cm.major_id,
+                        cm.major_name,
+                        cm.class_teacher_id,
+                        cm.class_teacher_name,
+                        cm.current_student_count,
+                        cm.class_status,
+                        cm.class_type
+                    FROM xg_class_msg cm
+                    WHERE cm.class_teacher_id = ?
+                      AND cm.deleted = 0
+                      AND cm.class_status = '1'
+                    ORDER BY cm.grade DESC, cm.class_name ASC
+                    """;
 
             // 执行查询
             List<Map<String, Object>> result = jdbcTemplate.queryForList(sql, teacherId);
@@ -530,6 +546,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 重构后的获取班级信息方法 - 自包含，无跨模块依赖
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> getClassInfoByTeacher(Long userId) {
         Map<String, Object> result = new HashMap<>();
 
@@ -582,8 +599,9 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
     /**
      * 从Map构建班级结果信息
      */
-    private void buildClassResultFromMap(Map<String, Object> result, Long teacherId, String teacherName, Map<String, Object> classInfo) {
-            result.put("teacherId", teacherId.toString());
+    private void buildClassResultFromMap(Map<String, Object> result, Long teacherId, String teacherName,
+            Map<String, Object> classInfo) {
+        result.put("teacherId", teacherId.toString());
         result.put("teacherName", teacherName);
         result.put("classId", classInfo.get("class_id") != null ? classInfo.get("class_id").toString() : "");
         result.put("className", (String) classInfo.get("class_name"));
@@ -613,36 +631,37 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
         return option;
     }
 
-        /**
+    /**
      * 确认选择班级（当用户从多个班级中选择一个时调用）
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> confirmClassSelection(Long teacherId, Long classId) {
         Map<String, Object> result = new HashMap<>();
 
         try {
             // 验证该班级确实属于该老师 - 使用自包含查询
             String sql = """
-                SELECT
-                    cm.id as class_id,
-                    cm.class_name,
-                    cm.class_code,
-                    cm.grade,
-                    cm.college_id,
-                    cm.college_name,
-                    cm.major_id,
-                    cm.major_name,
-                    cm.class_teacher_id,
-                    cm.class_teacher_name,
-                    cm.current_student_count,
-                    cm.class_status,
-                    cm.class_type
-                FROM xg_class_msg cm
-                WHERE cm.class_teacher_id = ?
-                  AND cm.id = ?
-                  AND cm.deleted = 0
-                  AND cm.class_status = '1'
-                """;
+                    SELECT
+                        cm.id as class_id,
+                        cm.class_name,
+                        cm.class_code,
+                        cm.grade,
+                        cm.college_id,
+                        cm.college_name,
+                        cm.major_id,
+                        cm.major_name,
+                        cm.class_teacher_id,
+                        cm.class_teacher_name,
+                        cm.current_student_count,
+                        cm.class_status,
+                        cm.class_type
+                    FROM xg_class_msg cm
+                    WHERE cm.class_teacher_id = ?
+                      AND cm.id = ?
+                      AND cm.deleted = 0
+                      AND cm.class_status = '1'
+                    """;
 
             List<Map<String, Object>> classList = jdbcTemplate.queryForList(sql, teacherId, classId);
 
@@ -663,38 +682,39 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
         }
     }
 
-        /**
+    /**
      * 获取班级学生列表（用于勾选）- 使用自包含查询
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<Map<String, Object>> getClassStudents(Long classId) {
         List<Map<String, Object>> students = new ArrayList<>();
 
         try {
             // 使用自包含查询获取学生列表，关联班级表获取学院和专业信息
             String sql = """
-                SELECT
-                    sm.id,
-                    sm.student_no,
-                    sm.name,
-                    sm.gender,
-                    sm.phone,
-                    sm.email,
-                    sm.student_status,
-                    cm.college_id,
-                    cm.college_name,
-                    cm.major_id,
-                    cm.major_name,
-                    cm.class_name,
-                    cm.grade
-                FROM xg_student_msg sm
-                LEFT JOIN xg_class_msg cm ON sm.class_id = cm.id
-                WHERE sm.class_id = ?
-                  AND sm.deleted = 0
-                  AND sm.student_status = '1'
-                  AND (cm.deleted IS NULL OR cm.deleted = 0)
-                ORDER BY sm.student_no ASC
-                """;
+                    SELECT
+                        sm.id,
+                        sm.student_no,
+                        sm.name,
+                        sm.gender,
+                        sm.phone,
+                        sm.email,
+                        sm.student_status,
+                        cm.college_id,
+                        cm.college_name,
+                        cm.major_id,
+                        cm.major_name,
+                        cm.class_name,
+                        cm.grade
+                    FROM xg_student_msg sm
+                    LEFT JOIN xg_class_msg cm ON sm.class_id = cm.id
+                    WHERE sm.class_id = ?
+                      AND sm.deleted = 0
+                      AND sm.student_status = '1'
+                      AND (cm.deleted IS NULL OR cm.deleted = 0)
+                    ORDER BY sm.student_no ASC
+                    """;
 
             List<Map<String, Object>> studentList = jdbcTemplate.queryForList(sql, classId);
 
@@ -702,7 +722,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
                 for (Map<String, Object> student : studentList) {
                     Map<String, Object> studentMap = new HashMap<>();
                     studentMap.put("id", student.get("id"));
-                    studentMap.put("studentCode", student.get("student_no") != null ? student.get("student_no").toString() : "");
+                    studentMap.put("studentCode",
+                            student.get("student_no") != null ? student.get("student_no").toString() : "");
                     studentMap.put("studentName", student.get("name") != null ? student.get("name").toString() : "");
 
                     // 性别转换：0-男，1-女
@@ -715,14 +736,20 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
 
                     studentMap.put("phone", student.get("phone") != null ? student.get("phone").toString() : "");
                     studentMap.put("email", student.get("email") != null ? student.get("email").toString() : "");
-                    studentMap.put("status", student.get("student_status") != null ? student.get("student_status").toString() : "1");
+                    studentMap.put("status",
+                            student.get("student_status") != null ? student.get("student_status").toString() : "1");
 
                     // 添加学院和专业信息
-                    studentMap.put("collegeId", student.get("college_id") != null ? student.get("college_id").toString() : "");
-                    studentMap.put("collegeName", student.get("college_name") != null ? student.get("college_name").toString() : "");
-                    studentMap.put("majorId", student.get("major_id") != null ? student.get("major_id").toString() : "");
-                    studentMap.put("majorName", student.get("major_name") != null ? student.get("major_name").toString() : "");
-                    studentMap.put("className", student.get("class_name") != null ? student.get("class_name").toString() : "");
+                    studentMap.put("collegeId",
+                            student.get("college_id") != null ? student.get("college_id").toString() : "");
+                    studentMap.put("collegeName",
+                            student.get("college_name") != null ? student.get("college_name").toString() : "");
+                    studentMap.put("majorId",
+                            student.get("major_id") != null ? student.get("major_id").toString() : "");
+                    studentMap.put("majorName",
+                            student.get("major_name") != null ? student.get("major_name").toString() : "");
+                    studentMap.put("className",
+                            student.get("class_name") != null ? student.get("class_name").toString() : "");
                     studentMap.put("grade", student.get("grade") != null ? student.get("grade").toString() : "");
 
                     students.add(studentMap);
@@ -739,10 +766,11 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
         }
     }
 
-        /**
+    /**
      * 根据批次获取可申请的奖学金类型
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<Map<String, Object>> getScholarshipTypesByBatch(Long batchId) {
         List<Map<String, Object>> scholarshipTypes = new ArrayList<>();
 
@@ -752,21 +780,24 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
 
             if (batchTypeIds != null && !batchTypeIds.isEmpty()) {
                 for (Long scholarshipTypeId : batchTypeIds) {
-                        // 查询奖学金类型基本信息
-                        JcbtScholarshipTypeVo typeInfo = scholarshipTypeService.queryById(scholarshipTypeId);
+                    // 查询奖学金类型基本信息
+                    JcbtScholarshipTypeVo typeInfo = scholarshipTypeService.queryById(scholarshipTypeId);
                     if (typeInfo != null && typeInfo.getStatus() == 1) { // 只返回启用的类型
-                            Map<String, Object> scholarshipType = new HashMap<>();
-                            scholarshipType.put("id", scholarshipTypeId);
-                            scholarshipType.put("name", typeInfo.getTypeName());
-                            scholarshipType.put("amount", typeInfo.getAwardAmount());
-                            scholarshipType.put("description", typeInfo.getDescription());
-                            scholarshipType.put("typeCategory", typeInfo.getTypeCategory());
-                            scholarshipType.put("levelType", typeInfo.getLevelType());
+                        Map<String, Object> scholarshipType = new HashMap<>();
+                        scholarshipType.put("id", scholarshipTypeId);
+                        scholarshipType.put("name", typeInfo.getTypeName());
+                        scholarshipType.put("amount", typeInfo.getAwardAmount());
+                        scholarshipType.put("description", typeInfo.getDescription());
+                        scholarshipType.put("typeCategory", typeInfo.getTypeCategory());
+                        scholarshipType.put("levelType", typeInfo.getLevelType());
 
                         // 查询该类型在该批次下的名额统计信息
-                        List<JcbtScholarshipQuotaVo> quotaList = quotaService.queryListByBatchAndType(batchId, scholarshipTypeId);
-                        int totalQuota = quotaList.stream().mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
-                        int usedQuota = quotaList.stream().mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
+                        List<JcbtScholarshipQuotaVo> quotaList = quotaService.queryListByBatchAndType(batchId,
+                                scholarshipTypeId);
+                        int totalQuota = quotaList.stream()
+                                .mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
+                        int usedQuota = quotaList.stream()
+                                .mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
                         int availableQuota = totalQuota - usedQuota;
 
                         scholarshipType.put("totalQuota", totalQuota);
@@ -805,6 +836,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 根据批次和班级获取带名额信息的奖学金类型（班主任专用）
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<Map<String, Object>> getScholarshipTypesWithQuota(Long batchId, Long classId) {
         List<Map<String, Object>> scholarshipTypes = new ArrayList<>();
 
@@ -822,8 +854,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
 
                     // 查询奖学金类型基本信息
                     JcbtScholarshipTypeVo typeInfo = scholarshipTypeService.queryById(scholarshipTypeId);
-                    log.info("奖学金类型基本信息: {}", typeInfo != null ?
-                        String.format("ID=%s, 名称=%s, 状态=%s, 金额=%s, 等级=%s",
+                    log.info("奖学金类型基本信息: {}", typeInfo != null ? String.format("ID=%s, 名称=%s, 状态=%s, 金额=%s, 等级=%s",
                             typeInfo.getId(), typeInfo.getTypeName(), typeInfo.getStatus(),
                             typeInfo.getAwardAmount(), typeInfo.getLevelType()) : "null");
 
@@ -837,14 +868,18 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
                         scholarshipType.put("levelType", typeInfo.getLevelType());
 
                         // 查询该班级在该奖学金类型下的名额分配信息（从jcbt_scholarship_quota表查询）
-                        log.info("开始查询班级名额 - SQL参数: classId={}, scholarshipTypeId={}, batchId={}", classId, scholarshipTypeId, batchId);
-                        log.info("执行SQL: SELECT * FROM jcbt_scholarship_quota WHERE allocation_level = 'CLASS' AND target_dept_id = {} AND scholarship_type_id = {} AND batch_id = {} AND status = 'ACTIVE'", classId, scholarshipTypeId, batchId);
+                        log.info("开始查询班级名额 - SQL参数: classId={}, scholarshipTypeId={}, batchId={}", classId,
+                                scholarshipTypeId, batchId);
+                        log.info(
+                                "执行SQL: SELECT * FROM jcbt_scholarship_quota WHERE allocation_level = 'CLASS' AND target_dept_id = {} AND scholarship_type_id = {} AND batch_id = {} AND status = 'ACTIVE'",
+                                classId, scholarshipTypeId, batchId);
 
-                        JcbtScholarshipQuotaVo classQuota = quotaService.selectClassQuota(classId, scholarshipTypeId, batchId);
-                        log.info("班级名额查询结果: {}", classQuota != null ?
-                            String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
-                                classQuota.getId(), classQuota.getTotalQuota(), classQuota.getUsedQuota(),
-                                classQuota.getAvailableQuota(), classQuota.getStatus()) : "null");
+                        JcbtScholarshipQuotaVo classQuota = quotaService.selectClassQuota(classId, scholarshipTypeId,
+                                batchId);
+                        log.info("班级名额查询结果: {}",
+                                classQuota != null ? String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
+                                        classQuota.getId(), classQuota.getTotalQuota(), classQuota.getUsedQuota(),
+                                        classQuota.getAvailableQuota(), classQuota.getStatus()) : "null");
 
                         if (classQuota != null) {
                             // 有班级名额分配
@@ -852,7 +887,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
                             scholarshipType.put("hasQuota", true);
                             int totalQuota = classQuota.getTotalQuota() != null ? classQuota.getTotalQuota() : 0;
                             int usedQuota = classQuota.getUsedQuota() != null ? classQuota.getUsedQuota() : 0;
-                            int availableQuota = classQuota.getAvailableQuota() != null ? classQuota.getAvailableQuota() : Math.max(0, totalQuota - usedQuota);
+                            int availableQuota = classQuota.getAvailableQuota() != null ? classQuota.getAvailableQuota()
+                                    : Math.max(0, totalQuota - usedQuota);
 
                             scholarshipType.put("totalQuota", totalQuota);
                             scholarshipType.put("usedQuota", usedQuota);
@@ -860,44 +896,49 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
                             scholarshipType.put("quotaStatus", availableQuota > 0 ? "available" : "full");
 
                             log.info("班级名额处理结果 - 类型: {}, 总名额: {}, 已用: {}, 可用: {}, 状态: {}",
-                                typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota, availableQuota > 0 ? "available" : "full");
+                                    typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota,
+                                    availableQuota > 0 ? "available" : "full");
                         } else {
                             // 没有班级名额分配，查询全校统计信息
                             log.info("未找到班级名额分配，开始查询全校名额");
                             log.info("执行全校名额查询SQL - 参数: batchId={}, scholarshipTypeId={}", batchId, scholarshipTypeId);
 
-                            List<JcbtScholarshipQuotaVo> quotaList = quotaService.queryListByBatchAndType(batchId, scholarshipTypeId);
+                            List<JcbtScholarshipQuotaVo> quotaList = quotaService.queryListByBatchAndType(batchId,
+                                    scholarshipTypeId);
                             log.info("全校名额查询结果数量: {}", quotaList != null ? quotaList.size() : 0);
 
                             if (quotaList != null && !quotaList.isEmpty()) {
                                 for (int i = 0; i < quotaList.size(); i++) {
                                     JcbtScholarshipQuotaVo quota = quotaList.get(i);
                                     log.info("全校名额[{}]: ID={}, 分配级别={}, 目标部门={}, 总名额={}, 已用={}, 可用={}",
-                                        i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptName(),
-                                        quota.getTotalQuota(), quota.getUsedQuota(), quota.getAvailableQuota());
+                                            i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptName(),
+                                            quota.getTotalQuota(), quota.getUsedQuota(), quota.getAvailableQuota());
                                 }
                             }
 
-                            int totalQuota = quotaList.stream().mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
-                            int usedQuota = quotaList.stream().mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
+                            int totalQuota = quotaList.stream()
+                                    .mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
+                            int usedQuota = quotaList.stream()
+                                    .mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
                             int availableQuota = Math.max(0, totalQuota - usedQuota);
 
                             scholarshipType.put("hasQuota", false);
                             scholarshipType.put("totalQuota", totalQuota);
                             scholarshipType.put("usedQuota", usedQuota);
                             scholarshipType.put("availableQuota", availableQuota);
-                            scholarshipType.put("quotaStatus", totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
+                            scholarshipType.put("quotaStatus",
+                                    totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
 
                             log.info("全校名额统计结果 - 类型: {} (全校), 总名额: {}, 已用: {}, 可用: {}, 状态: {}",
-                                typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota,
-                                totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
+                                    typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota,
+                                    totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
                         }
 
                         scholarshipTypes.add(scholarshipType);
                         log.info("奖学金类型 {} 处理完成，添加到结果列表", typeInfo.getTypeName());
                     } else {
                         log.warn("奖学金类型被跳过 - ID: {}, 原因: {}", scholarshipTypeId,
-                            typeInfo == null ? "类型信息不存在" : "状态未启用(status=" + typeInfo.getStatus() + ")");
+                                typeInfo == null ? "类型信息不存在" : "状态未启用(status=" + typeInfo.getStatus() + ")");
                     }
                 }
 
@@ -928,7 +969,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
                 for (int i = 0; i < scholarshipTypes.size(); i++) {
                     Map<String, Object> type = scholarshipTypes.get(i);
                     log.info("结果[{}]: 名称={}, 状态={}, 总名额={}, 可用名额={}",
-                        i, type.get("name"), type.get("quotaStatus"), type.get("totalQuota"), type.get("availableQuota"));
+                            i, type.get("name"), type.get("quotaStatus"), type.get("totalQuota"),
+                            type.get("availableQuota"));
                 }
             } else {
                 log.warn("批次 {} 未关联任何奖学金类型", batchId);
@@ -948,6 +990,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 测试班级名额查询（用于SQL日志调试）
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> testClassQuotaQuery(Long classId, Long scholarshipTypeId, Long batchId) {
         Map<String, Object> result = new HashMap<>();
 
@@ -960,7 +1003,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
 
             // 执行查询
             log.info("💾 执行班级名额查询...");
-            JcbtScholarshipClassQuotaVo classQuota = classQuotaService.queryAvailableQuota(classId, scholarshipTypeId, batchId);
+            JcbtScholarshipClassQuotaVo classQuota = classQuotaService.queryAvailableQuota(classId, scholarshipTypeId,
+                    batchId);
 
             // 记录查询结束时间
             long endTime = System.currentTimeMillis();
@@ -971,23 +1015,24 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
             if (classQuota != null) {
                 log.info("✅ 查询成功，找到班级名额记录");
                 log.info("📊 名额详情: ID={}, 批次ID={}, 奖学金类型ID={}, 班级ID={}",
-                    classQuota.getId(), classQuota.getBatchId(), classQuota.getScholarshipTypeId(), classQuota.getClassId());
+                        classQuota.getId(), classQuota.getBatchId(), classQuota.getScholarshipTypeId(),
+                        classQuota.getClassId());
                 log.info("📈 名额数据: 总名额={}, 已用名额={}, 可用名额={}, 状态={}",
-                    classQuota.getTotalQuota(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(), classQuota.getStatus());
+                        classQuota.getTotalQuota(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(),
+                        classQuota.getStatus());
 
                 result.put("found", true);
                 result.put("data", Map.of(
-                    "id", classQuota.getId(),
-                    "batchId", classQuota.getBatchId(),
-                    "scholarshipTypeId", classQuota.getScholarshipTypeId(),
-                    "classId", classQuota.getClassId(),
-                    "totalQuota", classQuota.getTotalQuota(),
-                    "usedQuota", classQuota.getUsedQuota(),
-                    "availableQuota", classQuota.getAvailableQuota(),
-                    "status", classQuota.getStatus(),
-                    "createTime", classQuota.getCreateTime(),
-                    "updateTime", classQuota.getUpdateTime()
-                ));
+                        "id", classQuota.getId(),
+                        "batchId", classQuota.getBatchId(),
+                        "scholarshipTypeId", classQuota.getScholarshipTypeId(),
+                        "classId", classQuota.getClassId(),
+                        "totalQuota", classQuota.getTotalQuota(),
+                        "usedQuota", classQuota.getUsedQuota(),
+                        "availableQuota", classQuota.getAvailableQuota(),
+                        "status", classQuota.getStatus(),
+                        "createTime", classQuota.getCreateTime(),
+                        "updateTime", classQuota.getUpdateTime()));
             } else {
                 log.warn("⚠️ 未找到班级名额记录");
                 log.info("🔍 可能原因:");
@@ -1033,6 +1078,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
      * 测试全校名额查询（用于SQL日志调试）
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> testSchoolQuotaQuery(Long batchId, Long scholarshipTypeId) {
         Map<String, Object> result = new HashMap<>();
 
@@ -1063,9 +1109,11 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
                 for (int i = 0; i < quotaList.size(); i++) {
                     JcbtScholarshipQuotaVo quota = quotaList.get(i);
                     log.info("📈 记录[{}]: ID={}, 分配级别={}, 目标部门ID={}, 目标部门={}",
-                        i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptId(), quota.getTargetDeptName());
+                            i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptId(),
+                            quota.getTargetDeptName());
                     log.info("📊 名额[{}]: 总名额={}, 已用={}, 预留={}, 可用={}, 状态={}",
-                        i, quota.getTotalQuota(), quota.getUsedQuota(), quota.getReservedQuota(), quota.getAvailableQuota(), quota.getStatus());
+                            i, quota.getTotalQuota(), quota.getUsedQuota(), quota.getReservedQuota(),
+                            quota.getAvailableQuota(), quota.getStatus());
 
                     Map<String, Object> quotaDetail = new HashMap<>();
                     quotaDetail.put("id", quota.getId());
@@ -1099,11 +1147,10 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
                 result.put("count", quotaList.size());
                 result.put("details", quotaDetails);
                 result.put("summary", Map.of(
-                    "totalQuota", totalQuota,
-                    "usedQuota", usedQuota,
-                    "availableQuota", availableQuota,
-                    "calculatedAvailable", Math.max(0, totalQuota - usedQuota)
-                ));
+                        "totalQuota", totalQuota,
+                        "usedQuota", usedQuota,
+                        "availableQuota", availableQuota,
+                        "calculatedAvailable", Math.max(0, totalQuota - usedQuota)));
 
             } else {
                 log.warn("⚠️ 未找到全校名额记录");
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java
index f7deb169..c0bcd59c 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java
@@ -23,6 +23,7 @@ import org.dromara.xg.domain.bo.XgDormBedBatchAllocateBo;
 import org.dromara.xg.service.IXgDormBedStudentService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.xg.domain.bo.XgDormBedBatchRecallBo;
+import org.dromara.xg.domain.vo.DormBuildingTreeVo;
 
 /**
  * 床位学生分配关系
@@ -126,4 +127,15 @@ public class XgDormBedStudentController extends BaseController {
     public R<Void> batchRecallBeds(@Validated(AddGroup.class) @RequestBody XgDormBedBatchRecallBo bo) {
         return toAjax(xgDormBedStudentService.batchRecallBeds(bo));
     }
+
+    /**
+     * 获取当前用户二级学院的宿舍楼树形结构
+     * 校区-宿舍区-宿舍楼三级结构，校区和宿舍区不可选，只有宿舍楼可以选择
+     */
+    @SaCheckPermission("dormBedStudent:dormBedStudent:list")
+    @GetMapping("/currentUserCollegeDormTree")
+    public R<List<DormBuildingTreeVo>> getCurrentUserCollegeDormBuildingTree() {
+        List<DormBuildingTreeVo> treeData = xgDormBedStudentService.getCurrentUserCollegeDormBuildingTree();
+        return R.ok(treeData);
+    }
 }
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java
index 1662bc80..a41a700e 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java
@@ -1286,4 +1286,15 @@ public class XgStudentMsgController extends BaseController {
         List<XgStudentTreeVo> studentTree = xgStudentMsgService.getStudentTree(secondaryCollegeId);
         return R.ok(studentTree);
     }
+
+    /**
+     * 获取当前用户所在学院的学生信息树
+     */
+    @SaCheckPermission("studentMsg:studentMsg:list")
+    @GetMapping("/getCurrentUserStudentTree")
+    public R<List<XgStudentTreeVo>> getCurrentUserStudentTree() {
+        log.info("获取当前用户所在学院的学生信息树");
+        List<XgStudentTreeVo> studentTree = xgStudentMsgService.getCurrentUserStudentTree();
+        return R.ok(studentTree);
+    }
 }
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java
index ba031671..7c31b8a6 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormBedStudentService.java
@@ -10,6 +10,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.dromara.xg.domain.bo.XgDormBedBatchRecallBo;
+import org.dromara.xg.domain.vo.DormBuildingTreeVo;
 
 /**
  * 床位学生分配关系Service接口
@@ -85,4 +86,12 @@ public interface IXgDormBedStudentService {
      * @return 是否成功
      */
     Boolean batchRecallBeds(XgDormBedBatchRecallBo bo);
+
+    /**
+     * 获取当前用户二级学院的宿舍楼树形结构
+     * 校区-宿舍区-宿舍楼三级结构，校区和宿舍区不可选，只有宿舍楼可以选择
+     *
+     * @return 宿舍楼树形结构数据
+     */
+    List<DormBuildingTreeVo> getCurrentUserCollegeDormBuildingTree();
 }
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentMsgService.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentMsgService.java
index 35d3cb52..fe89c09c 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentMsgService.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentMsgService.java
@@ -161,4 +161,11 @@ public interface IXgStudentMsgService {
      * @return 学生信息树
      */
     List<XgStudentTreeVo> getStudentTree(Long secondaryCollegeId);
+
+    /**
+     * 获取当前用户所在学院的学生信息树
+     *
+     * @return 学生信息树
+     */
+    List<XgStudentTreeVo> getCurrentUserStudentTree();
 }
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java
index 11cb945c..8dd3d955 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java
@@ -36,6 +36,15 @@ import org.dromara.xg.mapper.XgStudentMsgMapper;
 import org.dromara.xg.domain.XgStudentMsg;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.xg.domain.vo.DormBuildingTreeVo;
+import org.dromara.xg.domain.XgDormCampus;
+import org.dromara.xg.domain.XgDormArea;
+import org.dromara.xg.mapper.XgDormCampusMapper;
+import org.dromara.xg.mapper.XgDormAreaMapper;
+import org.dromara.xg.mapper.XgSysDeptMapper;
+import org.dromara.xg.domain.XgSysDept;
+import java.util.stream.Collectors;
+import java.util.LinkedHashMap;
 
 /**
  * 床位学生分配关系Service业务层处理
@@ -53,6 +62,9 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService {
     private final XgDormBuildingMapper xgDormBuildingMapper;
     private final XgDormRoomMapper xgDormRoomMapper;
     private final XgStudentMsgMapper xgStudentMsgMapper;
+    private final XgDormCampusMapper xgDormCampusMapper;
+    private final XgDormAreaMapper xgDormAreaMapper;
+    private final XgSysDeptMapper xgSysDeptMapper;
 
     /**
      * 查询床位学生分配关系
@@ -491,4 +503,230 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService {
 
         return true;
     }
+
+    /**
+     * 获取当前用户二级学院的宿舍楼树形结构
+     * 校区-宿舍区-宿舍楼三级结构，校区和宿舍区不可选，只有宿舍楼可以选择
+     *
+     * @return 宿舍楼树形结构数据
+     */
+    @Override
+    public List<DormBuildingTreeVo> getCurrentUserCollegeDormBuildingTree() {
+        try {
+            // 1. 获取当前用户的二级学院ID
+            Long collegeId = getCurrentUserCollegeId();
+            if (collegeId == null) {
+                log.warn("无法获取当前用户的二级学院信息");
+                return new ArrayList<>();
+            }
+
+            // 2. 通过xg_dorm_bed_student表获取分配给该学院的宿舍楼ID列表
+            Set<Long> buildingIds = getCollegeAllocatedBuildingIds(collegeId);
+            if (buildingIds.isEmpty()) {
+                log.info("学院 {} 还没有分配任何宿舍楼", collegeId);
+                return new ArrayList<>();
+            }
+
+            // 3. 获取宿舍楼信息并构建树形结构
+            return buildDormBuildingTree(buildingIds);
+
+        } catch (Exception e) {
+            log.error("获取当前用户二级学院宿舍楼树失败", e);
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * 获取当前用户的二级学院ID
+     * 通过当前用户的部门id，向上寻找包括他自己，找到dept_category前几位是xy-的就是二级学院
+     * 或者parent_id = 101的部门就是二级学院
+     */
+    private Long getCurrentUserCollegeId() {
+        try {
+            Long currentUserId = LoginHelper.getUserId();
+            Long currentDeptId = LoginHelper.getDeptId();
+
+            if (currentUserId == null || currentDeptId == null) {
+                log.warn("用户未登录或没有部门信息");
+                return null;
+            }
+
+            // 首先查找parent_id = 101的部门（使用LambdaQueryWrapper）
+            LambdaQueryWrapper<XgSysDept> parentQuery = Wrappers.lambdaQuery();
+            parentQuery.eq(XgSysDept::getParentId, 101L)
+                    .eq(XgSysDept::getStatus, "0")
+                    .eq(XgSysDept::getDelFlag, "0")
+                    .and(wrapper -> wrapper.eq(XgSysDept::getDeptId, currentDeptId)
+                            .or().like(XgSysDept::getAncestors, "," + currentDeptId + ",") // 中间位置
+                            .or().likeRight(XgSysDept::getAncestors, currentDeptId + ",") // 开头位置
+                            .or().likeLeft(XgSysDept::getAncestors, "," + currentDeptId) // 末尾位置
+                            .or().eq(XgSysDept::getAncestors, currentDeptId.toString())) // 单独一个值
+                    .last("LIMIT 1");
+
+            List<XgSysDept> parentColleges = xgSysDeptMapper.selectList(parentQuery);
+            if (!parentColleges.isEmpty()) {
+                return parentColleges.get(0).getDeptId();
+            }
+
+            // 如果上面的查询没找到，尝试通过dept_category查找
+            LambdaQueryWrapper<XgSysDept> categoryQuery = Wrappers.lambdaQuery();
+            categoryQuery.likeRight(XgSysDept::getDeptCategory, "xy-")
+                    .eq(XgSysDept::getStatus, "0")
+                    .eq(XgSysDept::getDelFlag, "0")
+                    .and(wrapper -> wrapper.eq(XgSysDept::getDeptId, currentDeptId)
+                            .or().like(XgSysDept::getAncestors, "," + currentDeptId + ",") // 中间位置
+                            .or().likeRight(XgSysDept::getAncestors, currentDeptId + ",") // 开头位置
+                            .or().likeLeft(XgSysDept::getAncestors, "," + currentDeptId) // 末尾位置
+                            .or().eq(XgSysDept::getAncestors, currentDeptId.toString())) // 单独一个值
+                    .last("LIMIT 1");
+
+            List<XgSysDept> categoryColleges = xgSysDeptMapper.selectList(categoryQuery);
+            return categoryColleges.isEmpty() ? null : categoryColleges.get(0).getDeptId();
+
+        } catch (Exception e) {
+            log.error("获取当前用户二级学院ID失败", e);
+            return null;
+        }
+    }
+
+    /**
+     * 获取分配给指定学院的宿舍楼ID列表
+     */
+    private Set<Long> getCollegeAllocatedBuildingIds(Long collegeId) {
+        try {
+            LambdaQueryWrapper<XgDormBedStudent> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.select(XgDormBedStudent::getBuildingId)
+                    .eq(XgDormBedStudent::getCollegeId, collegeId)
+                    .eq(XgDormBedStudent::getStatus, "0")
+                    .eq(XgDormBedStudent::getDeleted, "0")
+                    .isNotNull(XgDormBedStudent::getBuildingId)
+                    .groupBy(XgDormBedStudent::getBuildingId);
+
+            List<XgDormBedStudent> buildingRecords = baseMapper.selectList(queryWrapper);
+            return buildingRecords.stream()
+                    .map(XgDormBedStudent::getBuildingId)
+                    .collect(Collectors.toSet());
+
+        } catch (Exception e) {
+            log.error("获取学院 {} 分配的宿舍楼ID列表失败", collegeId, e);
+            return Set.of();
+        }
+    }
+
+    /**
+     * 根据宿舍楼ID列表构建宿舍楼树形结构
+     */
+    private List<DormBuildingTreeVo> buildDormBuildingTree(Set<Long> buildingIds) {
+        if (buildingIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        try {
+            // 获取宿舍楼信息
+            LambdaQueryWrapper<XgDormBuilding> buildingWrapper = Wrappers.lambdaQuery();
+            buildingWrapper.in(XgDormBuilding::getId, buildingIds)
+                    .eq(XgDormBuilding::getDeleted, "0")
+                    .orderByAsc(XgDormBuilding::getSortOrder, XgDormBuilding::getId);
+            List<XgDormBuilding> buildings = xgDormBuildingMapper.selectList(buildingWrapper);
+
+            if (buildings.isEmpty()) {
+                return new ArrayList<>();
+            }
+
+            // 获取涉及的宿舍区ID
+            Set<Long> areaIds = buildings.stream()
+                    .map(XgDormBuilding::getAreaId)
+                    .collect(Collectors.toSet());
+
+            // 获取宿舍区信息
+            LambdaQueryWrapper<XgDormArea> areaWrapper = Wrappers.lambdaQuery();
+            areaWrapper.in(XgDormArea::getId, areaIds)
+                    .eq(XgDormArea::getDeleted, "0")
+                    .orderByAsc(XgDormArea::getSortOrder, XgDormArea::getId);
+            List<XgDormArea> areas = xgDormAreaMapper.selectList(areaWrapper);
+
+            // 获取涉及的校区ID
+            Set<Long> campusIds = areas.stream()
+                    .map(XgDormArea::getCampusId)
+                    .collect(Collectors.toSet());
+
+            // 获取校区信息
+            LambdaQueryWrapper<XgDormCampus> campusWrapper = Wrappers.lambdaQuery();
+            campusWrapper.in(XgDormCampus::getId, campusIds)
+                    .eq(XgDormCampus::getDeleted, "0")
+                    .orderByAsc(XgDormCampus::getSortOrder, XgDormCampus::getId);
+            List<XgDormCampus> campuses = xgDormCampusMapper.selectList(campusWrapper);
+
+            // 构建树形结构
+            return buildTreeStructure(campuses, areas, buildings);
+
+        } catch (Exception e) {
+            log.error("构建宿舍楼树形结构失败", e);
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * 构建树形结构：校区-宿舍区-宿舍楼
+     */
+    private List<DormBuildingTreeVo> buildTreeStructure(List<XgDormCampus> campuses,
+            List<XgDormArea> areas,
+            List<XgDormBuilding> buildings) {
+
+        // 构建校区节点（第一层）
+        Map<Long, DormBuildingTreeVo> campusMap = new LinkedHashMap<>();
+        for (XgDormCampus campus : campuses) {
+            // 只保留有宿舍楼的校区
+            if (areas.stream().anyMatch(a -> a.getCampusId().equals(campus.getId()))) {
+                DormBuildingTreeVo campusNode = new DormBuildingTreeVo();
+                campusNode.setId(campus.getId());
+                campusNode.setLabel(campus.getCampusName());
+                campusNode.setType("campus");
+                campusNode.setDisabled(true); // 校区节点禁止点击
+                campusNode.setChildren(new ArrayList<>());
+                campusMap.put(campus.getId(), campusNode);
+            }
+        }
+
+        // 构建宿舍区节点（第二层）
+        Map<Long, DormBuildingTreeVo> areaMap = new LinkedHashMap<>();
+        for (XgDormArea area : areas) {
+            // 只保留有宿舍楼的宿舍区
+            if (buildings.stream().anyMatch(b -> b.getAreaId().equals(area.getId()))) {
+                DormBuildingTreeVo areaNode = new DormBuildingTreeVo();
+                areaNode.setId(area.getId());
+                areaNode.setLabel(area.getAreaName());
+                areaNode.setType("area");
+                areaNode.setDisabled(true); // 宿舍区节点禁止点击
+                areaNode.setChildren(new ArrayList<>());
+                areaMap.put(area.getId(), areaNode);
+
+                // 添加到对应的校区下
+                DormBuildingTreeVo campusNode = campusMap.get(area.getCampusId());
+                if (campusNode != null) {
+                    campusNode.getChildren().add(areaNode);
+                }
+            }
+        }
+
+        // 构建宿舍楼节点（第三层）
+        for (XgDormBuilding building : buildings) {
+            DormBuildingTreeVo buildingNode = new DormBuildingTreeVo();
+            buildingNode.setId(building.getId());
+            buildingNode.setLabel(building.getBuildingName());
+            buildingNode.setType("building");
+            buildingNode.setDisabled(false); // 宿舍楼节点可以点击
+            buildingNode.setBuildingFloors(building.getFloors());
+            buildingNode.setBuildingType(building.getBuildingType());
+            buildingNode.setChildren(new ArrayList<>());
+
+            // 添加到对应的宿舍区下
+            DormBuildingTreeVo areaNode = areaMap.get(building.getAreaId());
+            if (areaNode != null) {
+                areaNode.getChildren().add(buildingNode);
+            }
+        }
+
+        return new ArrayList<>(campusMap.values());
+    }
 }
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentManagerSourceServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentManagerSourceServiceImpl.java
index 211cbf5b..bed0bb0a 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentManagerSourceServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentManagerSourceServiceImpl.java
@@ -167,6 +167,7 @@ public class XgStudentManagerSourceServiceImpl implements IXgStudentManagerSourc
     }
 
     @Override
+    @Transactional(readOnly = true)
     public List<String> getAuthSourceNames(Long managerId) {
         // 1. 查询xg_student_manager_source表，manager_id=managerId, deleted=0,
         // status=0，获取auth_source
@@ -190,6 +191,7 @@ public class XgStudentManagerSourceServiceImpl implements IXgStudentManagerSourc
     }
 
     @Override
+    @Transactional(readOnly = true)
     public List<XgStudentManagerDeptTreeVo> getCurrentUserAuthDeptTree() {
         // 获取当前登录用户ID
         Long currentUserId = LoginHelper.getUserId();
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java
index 81eaf206..d513f82d 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentMsgServiceImpl.java
@@ -37,11 +37,13 @@ import org.dromara.xg.mapper.XgStudentManagerSourceMapper;
 import org.dromara.xg.mapper.XgClassTeacherCounselorRelMapper;
 import org.dromara.xg.mapper.XgClassMsgMapper;
 import org.dromara.xg.mapper.XgDormBedStudentMapper;
+import org.dromara.xg.mapper.XgSysDeptMapper;
 import org.dromara.xg.domain.XgStudentManager;
 import org.dromara.xg.domain.XgStudentManagerSource;
 import org.dromara.xg.domain.XgClassTeacherCounselorRel;
 import org.dromara.xg.domain.XgClassMsg;
 import org.dromara.xg.domain.XgDormBedStudent;
+import org.dromara.xg.domain.XgSysDept;
 import org.dromara.common.satoken.utils.LoginHelper;
 import java.util.stream.Collectors;
 
@@ -73,6 +75,7 @@ public class XgStudentMsgServiceImpl implements IXgStudentMsgService {
     private final XgClassTeacherCounselorRelMapper xgClassTeacherCounselorRelMapper;
     private final XgClassMsgMapper xgClassMsgMapper;
     private final XgDormBedStudentMapper xgDormBedStudentMapper;
+    private final XgSysDeptMapper xgSysDeptMapper;
 
     /**
      * 查询学生信息
@@ -1317,4 +1320,83 @@ public class XgStudentMsgServiceImpl implements IXgStudentMsgService {
 
         return result;
     }
+
+    /**
+     * 获取当前用户所在学院的学生信息树
+     *
+     * @return 学生信息树
+     */
+    @Override
+    public List<XgStudentTreeVo> getCurrentUserStudentTree() {
+        try {
+            // 1. 获取当前用户的二级学院ID
+            Long collegeId = getCurrentUserCollegeId();
+            if (collegeId == null) {
+                log.warn("无法获取当前用户的二级学院信息");
+                return new ArrayList<>();
+            }
+
+            log.info("获取到当前用户的学院ID: {}", collegeId);
+
+            // 2. 调用现有的getStudentTree方法
+            return getStudentTree(collegeId);
+
+        } catch (Exception e) {
+            log.error("获取当前用户学院的学生信息树失败", e);
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * 获取当前用户的二级学院ID
+     * 通过当前用户的部门id，向上寻找包括他自己，找到dept_category前几位是xy-的就是二级学院
+     * 或者parent_id = 101的部门就是二级学院
+     */
+    private Long getCurrentUserCollegeId() {
+        try {
+            Long currentUserId = LoginHelper.getUserId();
+            Long currentDeptId = LoginHelper.getDeptId();
+
+            if (currentUserId == null || currentDeptId == null) {
+                log.warn("用户未登录或没有部门信息");
+                return null;
+            }
+
+            // 首先查找parent_id = 101的部门（使用LambdaQueryWrapper）
+            LambdaQueryWrapper<XgSysDept> parentQuery = Wrappers.lambdaQuery();
+            parentQuery.eq(XgSysDept::getParentId, 101L)
+                    .eq(XgSysDept::getStatus, "0")
+                    .eq(XgSysDept::getDelFlag, "0")
+                    .and(wrapper -> wrapper.eq(XgSysDept::getDeptId, currentDeptId)
+                            .or().like(XgSysDept::getAncestors, "," + currentDeptId + ",") // 中间位置
+                            .or().likeRight(XgSysDept::getAncestors, currentDeptId + ",") // 开头位置
+                            .or().likeLeft(XgSysDept::getAncestors, "," + currentDeptId) // 末尾位置
+                            .or().eq(XgSysDept::getAncestors, currentDeptId.toString())) // 单独一个值
+                    .last("LIMIT 1");
+
+            List<XgSysDept> parentColleges = xgSysDeptMapper.selectList(parentQuery);
+            if (!parentColleges.isEmpty()) {
+                return parentColleges.get(0).getDeptId();
+            }
+
+            // 如果上面的查询没找到，尝试通过dept_category查找
+            LambdaQueryWrapper<XgSysDept> categoryQuery = Wrappers.lambdaQuery();
+            categoryQuery.likeRight(XgSysDept::getDeptCategory, "xy-")
+                    .eq(XgSysDept::getStatus, "0")
+                    .eq(XgSysDept::getDelFlag, "0")
+                    .and(wrapper -> wrapper.eq(XgSysDept::getDeptId, currentDeptId)
+                            .or().like(XgSysDept::getAncestors, "," + currentDeptId + ",") // 中间位置
+                            .or().likeRight(XgSysDept::getAncestors, currentDeptId + ",") // 开头位置
+                            .or().likeLeft(XgSysDept::getAncestors, "," + currentDeptId) // 末尾位置
+                            .or().eq(XgSysDept::getAncestors, currentDeptId.toString())) // 单独一个值
+                    .last("LIMIT 1");
+
+            List<XgSysDept> categoryColleges = xgSysDeptMapper.selectList(categoryQuery);
+            return categoryColleges.isEmpty() ? null : categoryColleges.get(0).getDeptId();
+
+        } catch (Exception e) {
+            log.error("获取当前用户二级学院ID失败", e);
+            return null;
+        }
+    }
 }
diff --git a/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts b/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts
index 59b286bb..372eca02 100644
--- a/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts
+++ b/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { DormBedStudentVO, DormBedStudentForm, DormBedStudentQuery } from '@/api/xg/xgss/dormBedStudent/dormBedStudent/types';
+import { DormBedStudentVO, DormBedStudentForm, DormBedStudentQuery, DormBuildingTreeVO } from '@/api/xg/xgss/dormBedStudent/dormBedStudent/types';
 
 /**
  * 查询床位学生分配关系列表
@@ -72,3 +72,14 @@ export const batchRecallDormBeds = (data: { bedIds: Array<string | number> }) =>
     data
   });
 };
+
+/**
+ * 获取当前用户二级学院的宿舍楼树形结构
+ * 校区-宿舍区-宿舍楼三级结构，校区和宿舍区不可选，只有宿舍楼可以选择
+ */
+export const getCurrentUserCollegeDormTree = (): AxiosPromise<DormBuildingTreeVO[]> => {
+  return request({
+    url: '/dormBedStudent/dormBedStudent/currentUserCollegeDormTree',
+    method: 'get'
+  });
+};
diff --git a/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/types.ts b/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/types.ts
index df1ac28a..62811938 100644
--- a/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/types.ts
+++ b/web/src/api/xg/xgss/dormBedStudent/dormBedStudent/types.ts
@@ -223,3 +223,43 @@ export interface DormBedStudentQuery extends PageQuery {
    */
   params?: any;
 }
+
+/**
+ * 宿舍楼树形结构VO
+ */
+export interface DormBuildingTreeVO {
+  /**
+   * 节点ID
+   */
+  id: string | number;
+
+  /**
+   * 节点名称
+   */
+  label: string;
+
+  /**
+   * 节点类型 (campus:校区, area:宿舍区, building:宿舍楼)
+   */
+  type: string;
+
+  /**
+   * 是否禁用节点（校区和宿舍区节点禁用点击）
+   */
+  disabled?: boolean;
+
+  /**
+   * 宿舍楼层数（仅宿舍楼节点有此字段）
+   */
+  buildingFloors?: number;
+
+  /**
+   * 宿舍楼类型(1男生楼 2女生楼 3混合楼)（仅宿舍楼节点有此字段）
+   */
+  buildingType?: string;
+
+  /**
+   * 子节点
+   */
+  children?: DormBuildingTreeVO[];
+}
diff --git a/web/src/api/xg/xsjcxx/studentMsg/index.ts b/web/src/api/xg/xsjcxx/studentMsg/index.ts
index 8abab8d0..65ac2221 100644
--- a/web/src/api/xg/xsjcxx/studentMsg/index.ts
+++ b/web/src/api/xg/xsjcxx/studentMsg/index.ts
@@ -207,6 +207,14 @@ export function getStudentTree(secondaryCollegeId: number = 101): AxiosPromise<R
   });
 }
 
+// 获取当前用户所在学院的学生信息树
+export function getCurrentUserStudentTree(): AxiosPromise<R<XgStudentTreeVO[]>> {
+  return request({
+    url: '/studentMsg/studentMsg/getCurrentUserStudentTree',
+    method: 'get'
+  });
+}
+
 // 学生状态修改
 export function changeStudentStatus(studentId: string | number, status: string): AxiosPromise<R<any>> {
   // 实际使用时连接后端接口
diff --git a/web/src/views/xg/xgss/ejxyfp/components/BedDialog.vue b/web/src/views/xg/xgss/ejxyfp/components/BedDialog.vue
new file mode 100644
index 00000000..28f99ee5
--- /dev/null
+++ b/web/src/views/xg/xgss/ejxyfp/components/BedDialog.vue
@@ -0,0 +1,150 @@
+<template>
+  <el-dialog v-model="visible" :title="title" width="500px" append-to-body @close="closeDialog">
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="床位编号" prop="bedCode">
+        <el-input v-model="form.bedCode" placeholder="请输入床位编号" maxlength="20" />
+      </el-form-item>
+      <el-form-item label="床位名称" prop="bedName">
+        <el-input v-model="form.bedName" placeholder="请输入床位名称" maxlength="20" />
+      </el-form-item>
+      <el-form-item label="床位状态" prop="bedStatus">
+        <el-radio-group v-model="form.bedStatus">
+          <el-radio label="0">空闲</el-radio>
+          <el-radio label="1" disabled>已分配</el-radio>
+          <el-radio label="2">维修中</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="床位类型" prop="bedType">
+        <el-radio-group v-model="form.bedType">
+          <el-radio label="1">下铺</el-radio>
+          <el-radio label="2">上铺</el-radio>
+          <el-radio label="3">中铺</el-radio>
+          <el-radio label="4">独立床</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" type="textarea" placeholder="请输入备注内容" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="visible = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, watch } from 'vue';
+import type { FormInstance, FormRules } from 'element-plus';
+import { DormBedForm } from '@/api/xg/xgss/dormBed/types';
+import { addDormBed, updateDormBed, getDormBed } from '@/api/xg/xgss/dormBed';
+
+const props = defineProps<{
+  modelValue: boolean;
+  title: string;
+  bedId?: string | number;
+  roomId: string | number;
+}>();
+
+const emit = defineEmits(['update:modelValue', 'success']);
+
+const formRef = ref<FormInstance>();
+const visible = ref(false);
+
+// 表单数据
+const initFormData: DormBedForm = {
+  id: '',
+  bedCode: '',
+  bedName: '',
+  roomId: '',
+  bedStatus: '0',
+  bedType: '4',
+  remark: ''
+};
+
+const form = reactive<DormBedForm>({ ...initFormData });
+
+// 表单校验规则
+const rules = reactive<FormRules>({
+  bedCode: [{ required: true, message: '床位编号不能为空', trigger: 'blur' }],
+  bedName: [{ required: true, message: '床位名称不能为空', trigger: 'blur' }],
+  bedStatus: [{ required: true, message: '床位状态不能为空', trigger: 'change' }],
+  bedType: [{ required: true, message: '床位类型不能为空', trigger: 'change' }]
+});
+
+// 监听visible属性变化
+watch(
+  () => props.modelValue,
+  (val) => {
+    visible.value = val;
+    if (val) {
+      resetForm();
+      // 设置表单初始值
+      form.roomId = props.roomId;
+      // 编辑模式，获取床位详情
+      if (props.bedId) {
+        console.log('开始获取床位详情, bedId:', props.bedId);
+        getDormBed(props.bedId)
+          .then((res) => {
+            console.log('获取床位详情成功:', res.data);
+            if (res.data) {
+              Object.assign(form, res.data);
+            }
+          })
+          .catch((error) => {
+            console.error('获取床位详情失败', error);
+          });
+      }
+    }
+  }
+);
+
+// 监听visible变化，同步回父组件
+watch(
+  () => visible.value,
+  (val) => {
+    emit('update:modelValue', val);
+  }
+);
+
+// 关闭对话框
+const closeDialog = () => {
+  visible.value = false;
+  resetForm();
+};
+
+// 重置表单
+const resetForm = () => {
+  Object.assign(form, { ...initFormData });
+  formRef.value?.resetFields();
+};
+
+// 提交表单
+const submitForm = () => {
+  formRef.value?.validate(async (valid) => {
+    if (valid) {
+      try {
+        if (props.bedId) {
+          // 修改
+          form.id = props.bedId;
+          await updateDormBed(form);
+        } else {
+          // 新增
+          await addDormBed(form);
+        }
+        closeDialog();
+        emit('success');
+      } catch (error) {
+        console.error('操作失败', error);
+      }
+    }
+  });
+};
+
+// 添加默认导出以支持导入
+defineOptions({
+  name: 'BedDialog'
+});
+</script>
diff --git a/web/src/views/xg/xgss/ejxyfp/components/CollegeAllocationDialog.vue b/web/src/views/xg/xgss/ejxyfp/components/CollegeAllocationDialog.vue
new file mode 100644
index 00000000..78570767
--- /dev/null
+++ b/web/src/views/xg/xgss/ejxyfp/components/CollegeAllocationDialog.vue
@@ -0,0 +1,1174 @@
+<template>
+  <el-dialog v-model="dialogVisible" :title="title" width="1200px" draggable :close-on-click-modal="false" @close="handleClose">
+    <div class="allocation-content">
+      <!-- 左侧：床位信息显示 -->
+      <el-card shadow="hover" class="bed-info-card">
+        <template #header>
+          <div class="card-header">
+            <span class="font-bold">待分配床位信息</span>
+          </div>
+        </template>
+        <div class="bed-info">
+          <el-tag type="primary" class="mr-2 mb-2"> 共选择了 {{ selectedBeds.length }} 个床位 </el-tag>
+          <el-tag type="success" class="mr-2 mb-2"> {{ roomCount }} 个房间 </el-tag>
+          <el-tag v-if="buildingInfo" :type="buildingInfo.buildingType === '1' ? 'primary' : 'danger'" class="mr-2 mb-2">
+            {{ buildingInfo.buildingType === '1' ? '男生楼' : '女生楼' }}：{{ buildingInfo.label }}
+          </el-tag>
+          <br />
+          <el-tag type="success" class="mr-2 mb-2"> 可分配：{{ availableBedsCount }} 个 </el-tag>
+          <el-tag type="warning" class="mr-2 mb-2"> 已分配：{{ allocatedBedsCount }} 个 </el-tag>
+          <el-tag type="danger" class="mr-2 mb-2"> 维修中：{{ maintenanceBedsCount }} 个 </el-tag>
+        </div>
+
+        <!-- 床位树形结构 -->
+        <div class="bed-tree-container mt-3">
+          <el-tree
+            :data="bedTreeData"
+            :props="{ label: 'label', children: 'children' }"
+            node-key="id"
+            :expand-on-click-node="false"
+            :default-expand-all="false"
+            class="bed-tree"
+          >
+            <template #default="{ node, data }">
+              <div class="bed-tree-node">
+                <span :class="getBedNodeClass(data)">
+                  <i v-if="data.type === 'room'" class="el-icon-house mr-1"></i>
+                  <i v-else-if="data.type === 'bed'" class="el-icon-bed mr-1"></i>
+                  {{ node.label }}
+                  <span v-if="data.type === 'bed'" class="bed-status-indicator ml-1">
+                    <el-tag v-if="data.bedData?.bedStatus === '0'" type="success" size="small">空闲</el-tag>
+                    <el-tag v-else-if="data.bedData?.bedStatus === '1'" type="warning" size="small">已分配</el-tag>
+                    <el-tag v-else-if="data.bedData?.bedStatus === '2'" type="danger" size="small">维修中</el-tag>
+                  </span>
+                  <!-- 显示已分配学院名称 -->
+                  <span v-if="data.type === 'bed' && data.bedData?.bedStatus === '1' && data.bedData?.collegeName" class="college-name ml-2">
+                    <el-tag size="small" type="info" class="college-tag">
+                      <i class="el-icon-school mr-1"></i>
+                      {{ data.bedData.collegeName }}
+                    </el-tag>
+                  </span>
+                </span>
+                <span v-if="data.type === 'room'" class="bed-count ml-2">
+                  <el-tag size="small" type="success" class="mr-1"> 可分配：{{ data.availableCount || 0 }} </el-tag>
+                  <el-tag size="small" type="warning" class="mr-1"> 已分配：{{ data.allocatedCount || 0 }} </el-tag>
+                  <el-tag size="small" type="danger"> 维修中：{{ data.maintenanceCount || 0 }} </el-tag>
+                </span>
+              </div>
+            </template>
+          </el-tree>
+        </div>
+      </el-card>
+
+      <!-- 右侧：学院选择树 -->
+      <el-card shadow="hover" class="college-select-card">
+        <template #header>
+          <div class="card-header">
+            <span class="font-bold">选择分配学院</span>
+            <span class="text-gray-500 text-sm ml-2">（请选择学院节点）</span>
+          </div>
+        </template>
+
+        <!-- 搜索框 -->
+        <el-input
+          v-model="searchKey"
+          prefix-icon="Search"
+          placeholder="请输入学院名称搜索"
+          clearable
+          class="mb-3"
+          @clear="handleSearchClear"
+          @keyup.enter="handleSearch"
+        />
+
+        <!-- 勾选统计信息 -->
+        <div class="selection-stats mb-3">
+          <el-alert
+            v-if="selectedCollegeIds.length > 0"
+            :title="getSelectionStatsTitle()"
+            :description="getSelectionStatsDescription()"
+            :type="getSelectionStatsType()"
+            show-icon
+            :closable="false"
+            class="selection-alert"
+          >
+            <template #icon>
+              <el-icon class="stats-icon">
+                <InfoFilled v-if="selectedCollegeIds.length === 0" />
+                <UserFilled v-else-if="props.buildingInfo?.buildingType === '1'" />
+                <Avatar v-else-if="props.buildingInfo?.buildingType === '2'" />
+                <UserFilled v-else />
+              </el-icon>
+            </template>
+          </el-alert>
+          <el-alert v-else title="未选择学院" description="请勾选要分配的学院" type="info" show-icon :closable="false" class="selection-alert" />
+        </div>
+
+        <!-- 学院树 -->
+        <el-tree
+          ref="collegeTreeRef"
+          :data="collegeTreeData"
+          :props="{ label: (data) => data.label, children: 'children' }"
+          node-key="id"
+          show-checkbox
+          check-strictly
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          :default-checked-keys="selectedCollegeIds"
+          highlight-current
+          @check-change="handleCheckChange"
+          class="college-tree"
+        >
+          <template #default="{ node, data }">
+            <div class="custom-tree-node">
+              <span :class="getNodeClass(data)">
+                {{ node.label }}
+              </span>
+              <span v-if="data.type === 'college'" class="college-info ml-2">
+                <template v-if="buildingInfo?.buildingType === '2'">
+                  <el-tag size="small" class="female-tag ml-1">女:{{ data.femaleAssigned || 0 }}/{{ data.femaleTotal || 0 }}</el-tag>
+                  <el-tag size="small" type="primary" class="ml-1">男:{{ data.maleAssigned || 0 }}/{{ data.maleTotal || 0 }}</el-tag>
+                </template>
+                <template v-else>
+                  <el-tag size="small" type="primary" class="ml-1">男:{{ data.maleAssigned || 0 }}/{{ data.maleTotal || 0 }}</el-tag>
+                  <el-tag size="small" class="female-tag ml-1">女:{{ data.femaleAssigned || 0 }}/{{ data.femaleTotal || 0 }}</el-tag>
+                </template>
+              </span>
+            </div>
+          </template>
+        </el-tree>
+
+        <!-- 学院人数分配 -->
+        <div v-if="selectedCollegeIds.length > 0" class="college-allocation mt-4">
+          <div class="allocation-header mb-3">
+            <span class="font-bold text-gray-700">学院床位分配</span>
+            <span class="text-gray-500 text-sm ml-2">（为每个学院指定分配的床位数）</span>
+          </div>
+
+          <div class="allocation-form">
+            <el-form :model="allocationForm" label-width="120px" size="small">
+              <el-form-item
+                v-for="collegeId in selectedCollegeIds"
+                :key="collegeId"
+                :label="getCollegeName(collegeId)"
+                :rules="[
+                  { required: true, message: '请输入床位数', trigger: 'blur' },
+                  {
+                    type: 'number',
+                    min: 0,
+                    max: availableBedsCount,
+                    message: `床位数必须在0-${availableBedsCount}之间`,
+                    trigger: 'blur'
+                  }
+                ]"
+              >
+                <el-input-number
+                  v-model="allocationForm[collegeId]"
+                  :min="0"
+                  :max="availableBedsCount"
+                  :precision="0"
+                  placeholder="请输入床位数"
+                  style="width: 200px"
+                  @change="handleAllocationChange"
+                />
+                <span class="text-gray-500 ml-2">个床位</span>
+              </el-form-item>
+            </el-form>
+
+            <!-- 分配统计信息 -->
+            <div class="allocation-stats mt-3">
+              <el-alert
+                :title="getAllocationStatsTitle()"
+                :description="getAllocationStatsDescription()"
+                :type="getAllocationStatsType()"
+                show-icon
+                :closable="false"
+                class="allocation-alert"
+              />
+            </div>
+          </div>
+        </div>
+      </el-card>
+    </div>
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="handleConfirm" :loading="confirmLoading" :disabled="selectedCollegeIds.length === 0"> 确认分配 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="CollegeAllocationDialog">
+import { ref, computed, watch, nextTick } from 'vue';
+import type { DormTreeNode } from '@/api/xg/xgss/xsssfjgl/types';
+import type { XgStudentTreeVO } from '@/api/xg/xsjcxx/studentMsg/types';
+import { getStudentTree } from '@/api/xg/xsjcxx/studentMsg';
+import { batchAllocateBedsToCollege } from '@/api/xg/xgss/dormBed';
+import ElMessage from 'element-plus/es/components/message/index';
+import ElMessageBox from 'element-plus/es/components/message-box/index';
+import { InfoFilled, UserFilled, Avatar } from '@element-plus/icons-vue';
+
+// 组件属性
+interface Props {
+  modelValue: boolean;
+  title: string;
+  selectedBeds: any[];
+  buildingInfo?: DormTreeNode;
+}
+
+// 组件事件
+interface Emits {
+  (e: 'update:modelValue', visible: boolean): void;
+  (e: 'success'): void;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  title: '分配床位给二级学院'
+});
+
+const emit = defineEmits<Emits>();
+
+// 响应式数据
+const collegeTreeRef = ref();
+const searchKey = ref('');
+const confirmLoading = ref(false);
+const selectedCollegeIds = ref<(string | number)[]>([]);
+const collegeTreeData = ref<XgStudentTreeVO[]>([]);
+const bedTreeData = ref<any[]>([]);
+
+// 学院人数分配表单
+const allocationForm = ref<Record<string | number, number>>({});
+
+// 计算属性
+const dialogVisible = computed({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value)
+});
+
+// 计算涉及的房间数量
+const roomCount = computed(() => {
+  const roomNames = new Set(props.selectedBeds.map((bed) => bed.roomName));
+  return roomNames.size;
+});
+
+// 计算各状态床位数量
+const availableBedsCount = computed(() => {
+  return props.selectedBeds.filter((bed) => bed.bedStatus === '0').length;
+});
+
+const allocatedBedsCount = computed(() => {
+  return props.selectedBeds.filter((bed) => bed.bedStatus === '1').length;
+});
+
+const maintenanceBedsCount = computed(() => {
+  return props.selectedBeds.filter((bed) => bed.bedStatus === '2').length;
+});
+
+// 获取可分配的床位（只有空闲状态的床位）
+const availableBeds = computed(() => {
+  return props.selectedBeds.filter((bed) => bed.bedStatus === '0');
+});
+
+// 计算已分配的床位数（学院分配表单中的）
+const formAllocatedBedsCount = computed(() => {
+  return Object.values(allocationForm.value).reduce((sum, count) => sum + (count || 0), 0);
+});
+
+// 计算剩余可分配床位数（基于空闲床位）
+const remainingBedsCount = computed(() => {
+  return availableBedsCount.value - formAllocatedBedsCount.value;
+});
+
+// 构建床位树形数据
+const buildBedTreeData = () => {
+  if (!props.selectedBeds || props.selectedBeds.length === 0) {
+    bedTreeData.value = [];
+    return;
+  }
+
+  // 按房间分组
+  const roomGroups = new Map();
+  props.selectedBeds.forEach((bed) => {
+    if (!roomGroups.has(bed.roomName)) {
+      roomGroups.set(bed.roomName, []);
+    }
+    roomGroups.get(bed.roomName).push(bed);
+  });
+
+  // 构建树形结构
+  const treeData = [];
+  roomGroups.forEach((beds, roomName) => {
+    // 统计房间内各状态床位数量
+    const availableCount = beds.filter((bed) => bed.bedStatus === '0').length;
+    const allocatedCount = beds.filter((bed) => bed.bedStatus === '1').length;
+    const maintenanceCount = beds.filter((bed) => bed.bedStatus === '2').length;
+
+    const roomNode = {
+      id: `room-${roomName}`,
+      label: roomName,
+      type: 'room',
+      bedCount: beds.length,
+      availableCount,
+      allocatedCount,
+      maintenanceCount,
+      children: beds.map((bed) => ({
+        id: bed.id,
+        label: `${bed.bedName}`,
+        type: 'bed',
+        bedData: bed
+      }))
+    };
+    treeData.push(roomNode);
+  });
+
+  bedTreeData.value = treeData;
+};
+
+// 过滤节点方法
+const filterNode = (value: string, data: XgStudentTreeVO) => {
+  if (!value) return true;
+  return data.label.toLowerCase().indexOf(value.toLowerCase()) !== -1;
+};
+
+// 获取节点样式类
+const getNodeClass = (data: XgStudentTreeVO) => {
+  const classes = [];
+
+  // 根据宿舍楼类型和学院匹配度设置高亮
+  if (data.type === 'college' && props.buildingInfo?.buildingType) {
+    if (props.buildingInfo.buildingType === '1') {
+      // 男生楼，男生学院重点显示
+      classes.push('college-node', 'male-priority');
+    } else if (props.buildingInfo.buildingType === '2') {
+      // 女生楼，女生学院重点显示
+      classes.push('college-node', 'female-priority');
+    }
+  } else if (data.type !== 'college') {
+    // 非学院节点禁用样式
+    classes.push('disabled-node');
+  }
+
+  return classes.join(' ');
+};
+
+// 获取床位节点样式类
+const getBedNodeClass = (data: any) => {
+  const classes = [];
+
+  if (data.type === 'room') {
+    classes.push('room-node');
+    if (props.buildingInfo?.buildingType === '1') {
+      classes.push('male-room-node');
+    } else if (props.buildingInfo?.buildingType === '2') {
+      classes.push('female-room-node');
+    }
+  } else if (data.type === 'bed') {
+    classes.push('bed-node');
+
+    // 根据床位状态添加样式
+    if (data.bedData?.bedStatus === '0') {
+      classes.push('available-bed-node'); // 可分配床位
+    } else if (data.bedData?.bedStatus === '1') {
+      classes.push('allocated-bed-node'); // 已分配床位
+    } else if (data.bedData?.bedStatus === '2') {
+      classes.push('maintenance-bed-node'); // 维修中床位
+    }
+
+    // 根据宿舍楼类型添加颜色主题
+    if (props.buildingInfo?.buildingType === '1') {
+      classes.push('male-bed-node');
+    } else if (props.buildingInfo?.buildingType === '2') {
+      classes.push('female-bed-node');
+    }
+  }
+
+  return classes.join(' ');
+};
+
+// 获取床位数量标签类型
+const getBedCountTagType = (data: any) => {
+  if (data.type === 'room') {
+    if (props.buildingInfo?.buildingType === '1') {
+      return 'primary'; // 男生楼使用主色调
+    } else if (props.buildingInfo?.buildingType === '2') {
+      return 'danger'; // 女生楼使用危险色（粉色系）
+    }
+  }
+  return 'info'; // 默认使用信息色
+};
+
+// 获取床位数量标签样式类
+const getBedCountTagClass = (data: any) => {
+  if (data.type === 'room') {
+    if (props.buildingInfo?.buildingType === '1') {
+      return 'male-bed-count-tag'; // 男生楼标签样式
+    } else if (props.buildingInfo?.buildingType === '2') {
+      return 'female-bed-count-tag'; // 女生楼标签样式
+    }
+  }
+  return '';
+};
+
+// 搜索处理
+const handleSearch = () => {
+  collegeTreeRef.value?.filter(searchKey.value);
+};
+
+const handleSearchClear = () => {
+  collegeTreeRef.value?.filter('');
+};
+
+// 监听搜索输入
+watch(searchKey, () => {
+  handleSearch();
+});
+
+// 复选框变更处理
+const handleCheckChange = (data: XgStudentTreeVO, checked: boolean) => {
+  // 只允许选择学院节点
+  if (data.type !== 'college') {
+    // 如果选择的不是学院，则取消选择
+    nextTick(() => {
+      collegeTreeRef.value?.setChecked(data.id, false, false);
+    });
+    ElMessage.warning('只能选择学院节点进行分配');
+    return;
+  }
+
+  // 检查是否还有可分配的床位
+  if (checked && availableBedsCount.value === 0) {
+    // 如果没有可分配床位，阻止勾选并给出提示
+    nextTick(() => {
+      collegeTreeRef.value?.setChecked(data.id, false, false);
+    });
+    ElMessage.warning('当前没有可分配的床位，只有空闲状态的床位才能分配');
+    return;
+  }
+
+  // 获取之前的选中学院列表
+  const previousCollegeIds = [...selectedCollegeIds.value];
+
+  // 更新选中的学院ID列表
+  const checkedKeys = collegeTreeRef.value?.getCheckedKeys() || [];
+  selectedCollegeIds.value = checkedKeys.filter((key: any) => {
+    const node = collegeTreeRef.value?.getNode(key);
+    return node?.data?.type === 'college';
+  });
+
+  // 只为新增的学院分配床位，保留已有学院的用户修改
+  updateAllocationFormForNewColleges(previousCollegeIds, selectedCollegeIds.value);
+};
+
+// 初始化人数分配表单（首次打开对话框时使用）
+const initAllocationForm = () => {
+  allocationForm.value = {};
+
+  if (selectedCollegeIds.value.length === 0) {
+    return;
+  }
+
+  // 检查是否还有可分配的床位
+  if (availableBedsCount.value === 0) {
+    // 如果没有可分配床位，清空选中的学院并给出提示
+    selectedCollegeIds.value = [];
+    nextTick(() => {
+      // 取消所有勾选状态
+      collegeTreeRef.value?.setCheckedKeys([]);
+    });
+    ElMessage.warning('当前没有可分配的床位，只有空闲状态的床位才能分配');
+    return;
+  }
+
+  // 新的床位分配规则：基于可分配床位（空闲状态）尽量满足学院需求
+  // 1. 按学院顺序逐个分配
+  // 2. 如果学院需求床位数 <= 剩余可分配床位数，则满足学院需求
+  // 3. 如果学院需求床位数 > 剩余可分配床位数，则分配所有剩余可分配床位
+
+  const totalAvailableBeds = availableBedsCount.value;
+  let remainingBeds = totalAvailableBeds;
+
+  // 获取学院的真实床位需求数（总需求数 - 已分配数）
+  const getCollegeDemand = (collegeId: string | number) => {
+    // 从学院树数据中查找学院节点
+    const college = findCollegeById(collegeTreeData.value, collegeId);
+    if (!college) return 0;
+
+    // 根据宿舍楼类型确定性别
+    if (props.buildingInfo?.buildingType === '1') {
+      // 男生楼，计算男生床位需求
+      const maleDemand = (college.maleTotal || 0) - (college.maleAssigned || 0);
+      return Math.max(0, maleDemand); // 确保不为负数
+    } else if (props.buildingInfo?.buildingType === '2') {
+      // 女生楼，计算女生床位需求
+      const femaleDemand = (college.femaleTotal || 0) - (college.femaleAssigned || 0);
+      return Math.max(0, femaleDemand); // 确保不为负数
+    } else {
+      // 混合楼，计算总床位需求
+      const totalDemand = (college.maleTotal || 0) + (college.femaleTotal || 0) - (college.maleAssigned || 0) - (college.femaleAssigned || 0);
+      return Math.max(0, totalDemand); // 确保不为负数
+    }
+  };
+
+  // 按顺序为每个学院分配床位
+  selectedCollegeIds.value.forEach((collegeId, index) => {
+    let bedCount = 0;
+
+    if (remainingBeds > 0) {
+      // 获取学院的真实床位需求数
+      const collegeDemand = getCollegeDemand(collegeId);
+
+      if (remainingBeds >= collegeDemand) {
+        // 如果剩余床位数 >= 学院需求，则满足学院需求
+        bedCount = collegeDemand;
+        remainingBeds -= collegeDemand;
+      } else {
+        // 如果剩余床位数 < 学院需求，则分配所有剩余床位
+        bedCount = remainingBeds;
+        remainingBeds = 0;
+      }
+    }
+
+    allocationForm.value[collegeId] = bedCount;
+  });
+};
+
+// 更新学院分配表单（只为新增学院分配床位，保留已有学院的用户修改）
+const updateAllocationFormForNewColleges = (previousCollegeIds: (string | number)[], currentCollegeIds: (string | number)[]) => {
+  // 检查是否还有可分配的床位
+  if (availableBedsCount.value === 0) {
+    // 如果没有可分配床位，清空选中的学院并给出提示
+    selectedCollegeIds.value = [];
+    allocationForm.value = {};
+    nextTick(() => {
+      // 取消所有勾选状态
+      collegeTreeRef.value?.setCheckedKeys([]);
+    });
+    ElMessage.warning('当前没有可分配的床位，只有空闲状态的床位才能分配');
+    return;
+  }
+
+  // 获取学院的真实床位需求数（总需求数 - 已分配数）
+  const getCollegeDemand = (collegeId: string | number) => {
+    // 从学院树数据中查找学院节点
+    const college = findCollegeById(collegeTreeData.value, collegeId);
+    if (!college) return 0;
+
+    // 根据宿舍楼类型确定性别
+    if (props.buildingInfo?.buildingType === '1') {
+      // 男生楼，计算男生床位需求
+      const maleDemand = (college.maleTotal || 0) - (college.maleAssigned || 0);
+      return Math.max(0, maleDemand); // 确保不为负数
+    } else if (props.buildingInfo?.buildingType === '2') {
+      // 女生楼，计算女生床位需求
+      const femaleDemand = (college.femaleTotal || 0) - (college.femaleAssigned || 0);
+      return Math.max(0, femaleDemand); // 确保不为负数
+    } else {
+      // 混合楼，计算总床位需求
+      const totalDemand = (college.maleTotal || 0) + (college.femaleTotal || 0) - (college.maleAssigned || 0) - (college.femaleAssigned || 0);
+      return Math.max(0, totalDemand); // 确保不为负数
+    }
+  };
+
+  // 找出新增的学院和取消勾选的学院
+  const addedColleges = currentCollegeIds.filter((id) => !previousCollegeIds.includes(id));
+  const removedColleges = previousCollegeIds.filter((id) => !currentCollegeIds.includes(id));
+
+  // 移除取消勾选的学院
+  removedColleges.forEach((collegeId) => {
+    delete allocationForm.value[collegeId];
+  });
+
+  // 如果有新增的学院，为其分配床位
+  if (addedColleges.length > 0) {
+    // 计算已分配的床位数（保留用户手动修改的数据）
+    const allocatedBeds = Object.keys(allocationForm.value)
+      .filter((collegeId) => currentCollegeIds.includes(collegeId))
+      .reduce((sum, collegeId) => sum + (allocationForm.value[collegeId] || 0), 0);
+
+    let remainingBeds = availableBedsCount.value - allocatedBeds;
+
+    // 为新增的学院分配床位
+    addedColleges.forEach((collegeId) => {
+      let bedCount = 0;
+
+      if (remainingBeds > 0) {
+        // 获取学院的真实床位需求数
+        const collegeDemand = getCollegeDemand(collegeId);
+
+        if (remainingBeds >= collegeDemand) {
+          // 如果剩余床位数 >= 学院需求，则满足学院需求
+          bedCount = collegeDemand;
+          remainingBeds -= collegeDemand;
+        } else {
+          // 如果剩余床位数 < 学院需求，则分配所有剩余床位
+          bedCount = remainingBeds;
+          remainingBeds = 0;
+        }
+      }
+
+      allocationForm.value[collegeId] = bedCount;
+    });
+  }
+};
+
+// 获取学院树数据
+const getCollegeTreeData = async () => {
+  try {
+    const res = await getStudentTree(101); // 默认使用二级学院ID 101
+    if (res.code === 200) {
+      // 处理树数据，标记非学院节点为不可选
+      const processTreeNodes = (nodes: XgStudentTreeVO[]) => {
+        return nodes.map((node) => {
+          // 设置节点的可选择性
+          if (node.type !== 'college') {
+            // 非学院节点不能选择
+            (node as any).disabled = true;
+          }
+
+          // 递归处理子节点
+          if (node.children && node.children.length > 0) {
+            node.children = processTreeNodes(node.children);
+          }
+          return node;
+        });
+      };
+
+      collegeTreeData.value = processTreeNodes((res.data as unknown as XgStudentTreeVO[]) || []);
+    } else {
+      ElMessage.error(res.msg || '获取学院信息失败');
+    }
+  } catch (error) {
+    console.error('获取学院树数据失败:', error);
+    ElMessage.error('获取学院信息失败');
+  }
+};
+
+// 获取勾选统计信息标题
+const getSelectionStatsTitle = () => {
+  if (selectedCollegeIds.value.length === 0) {
+    return '未选择学院';
+  }
+
+  if (props.buildingInfo?.buildingType === '1') {
+    return `已选择 ${selectedCollegeIds.value.length} 个学院（男生楼）`;
+  } else if (props.buildingInfo?.buildingType === '2') {
+    return `已选择 ${selectedCollegeIds.value.length} 个学院（女生楼）`;
+  }
+  return `已选择 ${selectedCollegeIds.value.length} 个学院`;
+};
+
+// 获取勾选统计信息描述
+const getSelectionStatsDescription = () => {
+  if (selectedCollegeIds.value.length === 0) {
+    return '请勾选要分配的学院';
+  }
+  return `共选择了 ${selectedCollegeIds.value.length} 个学院，请为每个学院指定分配的床位数`;
+};
+
+// 获取勾选统计信息类型
+const getSelectionStatsType = () => {
+  if (selectedCollegeIds.value.length === 0) {
+    return 'info';
+  }
+  return 'success';
+};
+
+// 获取学院名称
+const getCollegeName = (collegeId: string | number) => {
+  // 直接从学院树数据中查找学院名称
+  const college = findCollegeById(collegeTreeData.value, collegeId);
+  if (college && college.label) {
+    return college.label;
+  }
+
+  // 如果找不到，返回默认名称
+  return `学院${collegeId}`;
+};
+
+// 处理学院人数分配变化
+const handleAllocationChange = () => {
+  // 验证床位分配是否超出总床位数
+  const totalAllocated = Object.values(allocationForm.value).reduce((sum, count) => sum + (count || 0), 0);
+
+  if (totalAllocated > availableBedsCount.value) {
+    ElMessage.warning(`床位分配超出：已分配 ${totalAllocated} 个，但只有 ${availableBedsCount.value} 个可分配床位`);
+  }
+
+  console.log('学院人数分配变化:', allocationForm.value);
+  console.log('总分配床位数:', totalAllocated, '总可分配床位数:', availableBedsCount.value);
+};
+
+// 获取分配统计信息标题
+const getAllocationStatsTitle = () => {
+  if (remainingBedsCount.value === 0) {
+    return '床位分配完成';
+  } else if (remainingBedsCount.value > 0) {
+    return `床位分配进行中`;
+  } else {
+    return '床位分配超出';
+  }
+};
+
+// 获取分配统计信息描述
+const getAllocationStatsDescription = () => {
+  if (remainingBedsCount.value === 0) {
+    return `已分配 ${formAllocatedBedsCount.value} 个床位，分配完成！`;
+  } else if (remainingBedsCount.value > 0) {
+    return `已分配 ${formAllocatedBedsCount.value} 个床位，还可以分配 ${remainingBedsCount.value} 个床位`;
+  } else {
+    return `已分配 ${formAllocatedBedsCount.value} 个床位，超出 ${Math.abs(remainingBedsCount.value)} 个床位`;
+  }
+};
+
+// 获取分配统计信息类型
+const getAllocationStatsType = () => {
+  if (remainingBedsCount.value === 0) {
+    return 'success';
+  } else if (remainingBedsCount.value > 0) {
+    return 'warning';
+  } else {
+    return 'error';
+  }
+};
+
+// 递归查找学院节点
+const findCollegeById = (nodes: XgStudentTreeVO[], targetId: string | number): XgStudentTreeVO | null => {
+  for (const node of nodes) {
+    if (node.id === targetId) {
+      return node;
+    }
+    if (node.children && node.children.length > 0) {
+      const found = findCollegeById(node.children, targetId);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+};
+
+// 确认分配
+const handleConfirm = async () => {
+  if (selectedCollegeIds.value.length === 0) {
+    ElMessage.warning('请选择要分配的学院');
+    return;
+  }
+
+  if (availableBedsCount.value === 0) {
+    ElMessage.warning('请选择可分配的床位（只有空闲状态的床位才能分配）');
+    return;
+  }
+
+  // 验证学院人数分配
+  const totalAllocated = Object.values(allocationForm.value).reduce((sum, count) => sum + (count || 0), 0);
+  if (totalAllocated > availableBedsCount.value) {
+    ElMessage.warning(`床位分配超出：已分配 ${totalAllocated} 个，但只有 ${availableBedsCount.value} 个可分配床位`);
+    return;
+  }
+
+  // 验证每个学院都有分配数量
+  // for (const collegeId of selectedCollegeIds.value) {
+  //   if (!allocationForm.value[collegeId] || allocationForm.value[collegeId] <= 0) {
+  //     ElMessage.warning(`请为学院"${getCollegeName(collegeId)}"指定分配的床位数`);
+  //     return;
+  //   }
+  // }
+
+  try {
+    // 构建详细的分配信息提示
+    const allocationDetails = selectedCollegeIds.value
+      .map((collegeId) => {
+        const collegeName = getCollegeName(collegeId);
+        const bedCount = allocationForm.value[collegeId] || 0;
+        return `  • ${collegeName}：${bedCount} 个床位`;
+      })
+      .join('\n');
+
+    const confirmMessage = `确定要分配以下床位吗？\n\n总选择床位：${props.selectedBeds.length} 个\n可分配床位：${availableBedsCount.value} 个\n总分配数：${totalAllocated} 个\n\n分配详情：\n${allocationDetails}`;
+
+    await ElMessageBox.confirm(confirmMessage, '确认分配', {
+      confirmButtonText: '确定分配',
+      cancelButtonText: '取消',
+      type: 'warning',
+      dangerouslyUseHTMLString: false
+    });
+
+    confirmLoading.value = true;
+
+    // 获取真正的学院ID列表和对应的学生人数（从树节点数据中提取collegeId字段）
+    const realCollegeIds: number[] = [];
+    const collegeStudentCounts: number[] = [];
+
+    selectedCollegeIds.value.forEach((treeNodeId) => {
+      const college = findCollegeById(collegeTreeData.value, treeNodeId);
+      if (!college?.collegeId) {
+        throw new Error(`学院"${getCollegeName(treeNodeId)}"的ID信息不完整`);
+      }
+      realCollegeIds.push(college.collegeId);
+      collegeStudentCounts.push(allocationForm.value[treeNodeId] || 0);
+    });
+
+    // 构建分配参数，只使用可分配的床位（空闲状态）
+    const allocationData = {
+      bedIds: availableBeds.value.map((bed) => bed.id), // 只传递可分配的床位ID
+      collegeIds: realCollegeIds, // 使用真正的学院ID
+      collegeStudentCounts: collegeStudentCounts, // 与学院ID一一对应的学生人数
+      buildingId: props.buildingInfo?.id,
+      buildingType: props.buildingInfo?.buildingType
+    };
+
+    console.log('床位分配参数:', allocationData);
+
+    // 调用批量分配API
+    await batchAllocateBedsToCollege(allocationData);
+
+    ElMessage.success('床位分配成功');
+    emit('success');
+    handleClose();
+  } catch (error: any) {
+    if (error !== 'cancel') {
+      console.error('床位分配失败:', error);
+      ElMessage.error(error.message || '床位分配失败');
+    }
+  } finally {
+    confirmLoading.value = false;
+  }
+};
+
+// 关闭对话框
+const handleClose = () => {
+  // 重置数据
+  selectedCollegeIds.value = [];
+  searchKey.value = '';
+  confirmLoading.value = false;
+  bedTreeData.value = [];
+  allocationForm.value = {}; // 重置人数分配表单
+
+  emit('update:modelValue', false);
+};
+
+// 监听对话框打开，获取学院数据
+watch(
+  () => props.modelValue,
+  (visible) => {
+    if (visible) {
+      getCollegeTreeData();
+      buildBedTreeData();
+    }
+  }
+);
+
+// 监听床位选择变化，重新构建树形数据
+watch(
+  () => props.selectedBeds,
+  (newBeds, oldBeds) => {
+    buildBedTreeData();
+
+    // 如果床位被清空，自动清空已选择的学院
+    if (newBeds.length === 0 && oldBeds && oldBeds.length > 0) {
+      selectedCollegeIds.value = [];
+      allocationForm.value = {};
+      nextTick(() => {
+        // 取消所有勾选状态
+        collegeTreeRef.value?.setCheckedKeys([]);
+      });
+      ElMessage.info('床位已清空，已自动清空学院选择');
+    }
+
+    // 如果没有可分配床位，自动清空已选择的学院
+    const newAvailableCount = newBeds.filter((bed) => bed.bedStatus === '0').length;
+    const oldAvailableCount = oldBeds ? oldBeds.filter((bed) => bed.bedStatus === '0').length : 0;
+
+    if (newAvailableCount === 0 && oldAvailableCount > 0) {
+      selectedCollegeIds.value = [];
+      allocationForm.value = {};
+      nextTick(() => {
+        // 取消所有勾选状态
+        collegeTreeRef.value?.setCheckedKeys([]);
+      });
+      ElMessage.warning('没有可分配的床位，已自动清空学院选择');
+    }
+  },
+  { deep: true }
+);
+</script>
+
+<style scoped>
+.allocation-content {
+  display: flex;
+  gap: 16px;
+  min-height: 600px;
+}
+
+/* 左右布局卡片样式 */
+.bed-info-card {
+  flex: 0 0 400px;
+  min-height: 600px;
+  overflow: visible;
+}
+
+.college-select-card {
+  flex: 1;
+  min-height: 600px;
+  overflow: visible;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.bed-info {
+  display: flex;
+  align-items: flex-start;
+  flex-wrap: wrap;
+  gap: 8px;
+  line-height: 1.4;
+}
+
+.bed-tree-container {
+  max-height: 450px;
+  overflow-y: auto;
+  border: 1px solid var(--el-border-color);
+  border-radius: 4px;
+  padding: 8px;
+  background-color: var(--el-fill-color-lighter);
+  margin-bottom: 16px;
+}
+
+.bed-tree {
+  background: transparent;
+}
+
+.bed-tree-node {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  min-width: max-content;
+}
+
+.room-node {
+  font-weight: 600;
+  color: var(--el-color-primary);
+}
+
+.bed-node {
+  font-weight: 500;
+  color: var(--el-text-color-regular);
+}
+
+/* 男生楼样式 */
+.male-room-node {
+  color: var(--el-color-primary);
+  background-color: rgba(64, 158, 255, 0.1);
+  padding: 2px 6px;
+  border-radius: 4px;
+}
+
+.male-bed-node {
+  color: var(--el-color-primary);
+  padding: 1px 4px;
+  border-radius: 3px;
+}
+
+/* 女生楼样式 */
+.female-room-node {
+  color: #ff69b4;
+  background-color: rgba(255, 105, 180, 0.1);
+  padding: 2px 6px;
+  border-radius: 4px;
+}
+
+.female-bed-node {
+  color: #ff69b4;
+  padding: 1px 4px;
+  border-radius: 3px;
+}
+
+/* 床位状态样式 */
+.available-bed-node {
+  background-color: rgba(103, 194, 58, 0.1) !important;
+  color: var(--el-color-success) !important;
+  font-weight: 500;
+  /* border-left: 3px solid var(--el-color-success); */
+  padding-left: 8px !important;
+}
+
+.allocated-bed-node {
+  background-color: rgba(230, 162, 60, 0.1) !important;
+  color: var(--el-color-warning) !important;
+  opacity: 0.7;
+}
+
+.maintenance-bed-node {
+  background-color: rgba(245, 108, 108, 0.1) !important;
+  color: var(--el-color-danger) !important;
+  opacity: 0.7;
+  text-decoration: line-through;
+}
+
+.bed-count {
+  font-size: 12px;
+  display: flex;
+  gap: 4px;
+  align-items: center;
+}
+
+.bed-status-indicator {
+  display: inline-flex;
+  align-items: center;
+}
+
+/* 学院名称标签样式 */
+.college-name {
+  display: inline-flex;
+  align-items: center;
+}
+
+.college-tag {
+  background-color: rgba(144, 147, 153, 0.1) !important;
+  border-color: rgba(144, 147, 153, 0.3) !important;
+  color: var(--el-text-color-regular) !important;
+  font-size: 11px;
+  padding: 2px 6px;
+  border-radius: 3px;
+}
+
+.college-tag .el-icon-school {
+  font-size: 10px;
+  margin-right: 2px;
+}
+
+/* 床位数量标签样式 */
+.male-bed-count-tag {
+  background-color: rgba(64, 158, 255, 0.1) !important;
+  border-color: rgba(64, 158, 255, 0.3) !important;
+  color: var(--el-color-primary) !important;
+}
+
+.female-bed-count-tag {
+  background-color: rgba(255, 105, 180, 0.1) !important;
+  border-color: rgba(255, 105, 180, 0.3) !important;
+  color: #ff69b4 !important;
+}
+
+.college-tree {
+  max-height: 450px;
+  overflow-y: auto;
+  border: 1px solid var(--el-border-color);
+  border-radius: 4px;
+  padding: 8px;
+  margin-bottom: 16px;
+}
+
+.custom-tree-node {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  min-width: max-content;
+}
+
+.college-info {
+  font-size: 12px;
+  white-space: nowrap;
+}
+
+/* 学院节点样式 */
+.college-node {
+  font-weight: 500;
+}
+
+.male-priority {
+  color: var(--el-color-primary);
+}
+
+.female-priority {
+  color: #ff69b4;
+}
+
+.disabled-node {
+  color: var(--el-text-color-disabled);
+  cursor: not-allowed;
+}
+
+/* 女生标签样式 */
+.female-tag {
+  background-color: rgba(255, 105, 180, 0.1) !important;
+  color: #ff69b4 !important;
+  border-color: rgba(255, 105, 180, 0.2) !important;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+}
+
+/* 树节点复选框样式调整 */
+.college-tree :deep(.el-tree-node__content) {
+  min-height: 32px;
+  align-items: center;
+}
+
+.college-tree :deep(.el-checkbox) {
+  margin-right: 8px;
+}
+
+/* 禁用非学院节点的复选框 */
+.college-tree :deep(.el-tree-node .disabled-node) + .el-checkbox {
+  display: none;
+}
+
+.selection-stats {
+  margin-bottom: 16px;
+}
+
+.selection-alert {
+  border-radius: 4px;
+  font-size: 14px;
+}
+
+.stats-icon {
+  margin-right: 8px;
+}
+
+/* 学院人数分配表单样式 */
+.college-allocation {
+  border-top: 1px solid var(--el-border-color-light);
+  padding-top: 16px;
+}
+
+.allocation-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16px;
+}
+
+.allocation-form {
+  background-color: var(--el-fill-color-lighter);
+  border-radius: 6px;
+  padding: 16px;
+}
+
+.allocation-stats {
+  margin-top: 16px;
+}
+
+.allocation-alert {
+  margin-bottom: 0;
+}
+
+/* 表单验证样式 */
+:deep(.el-form-item.is-error .el-input-number) {
+  border-color: var(--el-color-danger);
+}
+
+:deep(.el-form-item.is-error .el-input-number:focus-within) {
+  border-color: var(--el-color-danger);
+  box-shadow: 0 0 0 1px var(--el-color-danger-light-8);
+}
+</style>
diff --git a/web/src/views/xg/xgss/ejxyfp/components/RoomDialog.vue b/web/src/views/xg/xgss/ejxyfp/components/RoomDialog.vue
new file mode 100644
index 00000000..e6b94692
--- /dev/null
+++ b/web/src/views/xg/xgss/ejxyfp/components/RoomDialog.vue
@@ -0,0 +1,171 @@
+<template>
+  <el-dialog v-model="visible" :title="title" width="500px" append-to-body @close="closeDialog">
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="楼层" prop="floorNum">
+        <el-input v-model="form.floorNum" placeholder="请输入楼层" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="房间编号" prop="roomCode">
+        <el-input v-model="form.roomCode" placeholder="请输入房间编号" maxlength="20" />
+      </el-form-item>
+      <el-form-item label="房间名称" prop="roomName">
+        <el-input v-model="form.roomName" placeholder="请输入房间名称" maxlength="20" />
+      </el-form-item>
+      <el-form-item label="房间类型" prop="roomType">
+        <el-select v-model="form.roomType" placeholder="请选择房间类型" clearable style="width: 100%">
+          <el-option label="标准间" value="1" />
+          <el-option label="单人间" value="2" />
+          <el-option label="套间" value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="床位数量" prop="actualBeds">
+        <el-input-number v-model="form.actualBeds" :min="1" :max="8" controls-position="right" style="width: 100%" />
+      </el-form-item>
+      <el-form-item label="房间面积" prop="roomArea">
+        <el-input v-model="form.roomArea" placeholder="请输入房间面积" maxlength="20">
+          <template #append>
+            <span style="color: #000; background: transparent">平方米</span>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="房间状态" prop="roomStatus">
+        <el-radio-group v-model="form.roomStatus">
+          <el-radio label="0">正常</el-radio>
+          <el-radio label="1">维修中</el-radio>
+          <el-radio label="2">停用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" type="textarea" placeholder="请输入备注内容" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="visible = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, watch } from 'vue';
+import type { FormInstance, FormRules } from 'element-plus';
+import { DormRoomForm, DormRoomVO } from '@/api/xg/xgss/dormRoom/types';
+import { addDormRoom, updateDormRoom } from '@/api/xg/xgss/dormRoom';
+
+const props = defineProps<{
+  modelValue: boolean;
+  title: string;
+  roomId?: string | number;
+  floorNum: number;
+  buildingId: string | number;
+  room?: DormRoomVO;
+}>();
+
+const emit = defineEmits(['update:modelValue', 'success']);
+
+const formRef = ref<FormInstance>();
+const visible = ref(false);
+
+// 表单数据
+const initFormData: DormRoomForm = {
+  id: undefined,
+  roomCode: '',
+  roomName: '',
+  floorNum: 1,
+  buildingId: '',
+  actualBeds: 4,
+  roomArea: 0,
+  roomType: '1',
+  roomStatus: '0',
+  remark: ''
+};
+
+const form = reactive<DormRoomForm>({ ...initFormData });
+
+// 表单校验规则
+const rules = reactive<FormRules>({
+  roomCode: [{ required: true, message: '房间编号不能为空', trigger: 'blur' }],
+  roomName: [{ required: true, message: '房间名称不能为空', trigger: 'blur' }],
+  floorNum: [{ required: true, message: '楼层不能为空', trigger: 'blur' }],
+  actualBeds: [{ required: true, message: '床位数量不能为空', trigger: 'change' }],
+  roomType: [{ required: true, message: '房间类型不能为空', trigger: 'change' }],
+  roomStatus: [{ required: true, message: '房间状态不能为空', trigger: 'change' }]
+});
+
+// 监听visible属性变化
+watch(
+  () => props.modelValue,
+  (val) => {
+    visible.value = val;
+    if (val) {
+      // 完全重置表单，确保没有残留数据
+      resetForm();
+
+      // 重新设置基本参数
+      form.floorNum = props.floorNum;
+      form.buildingId = props.buildingId;
+
+      // 如果是编辑模式且有room数据，填充表单数据
+      if (props.room) {
+        Object.keys(form).forEach((key) => {
+          if (key in props.room) {
+            form[key] = props.room[key];
+          }
+        });
+      }
+    }
+  }
+);
+
+// 监听visible变化，同步回父组件
+watch(
+  () => visible.value,
+  (val) => {
+    emit('update:modelValue', val);
+  }
+);
+
+// 关闭对话框
+const closeDialog = () => {
+  visible.value = false;
+  resetForm();
+};
+
+// 重置表单
+const resetForm = () => {
+  // 使用深拷贝确保完全重置
+  Object.keys(form).forEach((key) => {
+    form[key] = initFormData[key];
+  });
+  formRef.value?.resetFields();
+};
+
+// 提交表单
+const submitForm = () => {
+  formRef.value?.validate(async (valid) => {
+    if (valid) {
+      try {
+        console.log(props.roomId);
+        if (props.roomId) {
+          // 修改
+          form.id = props.roomId;
+          await updateDormRoom(form);
+        } else {
+          // 新增
+          await addDormRoom(form);
+        }
+        closeDialog();
+        emit('success');
+      } catch (error) {
+        console.error('操作失败', error);
+      }
+    }
+  });
+};
+
+// 添加默认导出以支持导入
+defineOptions({
+  name: 'RoomDialog'
+});
+</script>
diff --git a/web/src/views/xg/xgss/ejxyfp/ejxyfp.vue b/web/src/views/xg/xgss/ejxyfp/ejxyfp.vue
new file mode 100644
index 00000000..731806e4
--- /dev/null
+++ b/web/src/views/xg/xgss/ejxyfp/ejxyfp.vue
@@ -0,0 +1,1377 @@
+<template>
+  <div class="p-2">
+    <div class="flex-layout">
+      <!-- 宿舍树 -->
+      <div class="tree-sidebar">
+        <!-- 宿舍楼树 -->
+        <el-card shadow="hover" class="tree-card">
+          <div class="card-header-title">宿舍楼</div>
+          <el-input
+            v-model="buildingName"
+            prefix-icon="Search"
+            placeholder="请输入宿舍楼名称"
+            clearable
+            @clear="watchBuildingName"
+            @keyup.enter="watchBuildingName"
+          >
+          </el-input>
+          <el-tree
+            ref="dormTreeRef"
+            class="mt-2"
+            node-key="id"
+            :data="dormOptions"
+            :props="{ label: 'label', children: 'children', disabled: 'disabled' }"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          >
+            <template #default="{ node, data }">
+              <div class="custom-tree-node">
+                <el-tooltip v-if="data.disabled" effect="dark" content="此节点不可选择，请选择具体的宿舍楼" placement="right">
+                  <span :class="{ 'disabled-node': data.disabled }">{{ node.label }}</span>
+                </el-tooltip>
+                <span v-else>
+                  <span v-if="data.type === 'building'" :class="data.buildingType === '1' ? 'male-building' : 'female-building'">
+                    {{ data.buildingType === '1' ? '（男）' : '（女）' }}
+                  </span>
+                  {{ node.label }}
+                </span>
+                <span v-if="data.type === 'college' || data.type === 'class'" class="bed-count">
+                  <template v-if="selectedBuilding?.buildingType === '2'">
+                    <el-tag size="small" class="female-tag ml-2">女:{{ data.femaleAssigned }}/{{ data.femaleTotal }}</el-tag>
+                    <el-tag size="small" type="primary" class="ml-2">男:{{ data.maleAssigned }}/{{ data.maleTotal }}</el-tag>
+                  </template>
+                  <template v-else>
+                    <el-tag size="small" type="primary" class="ml-2">男:{{ data.maleAssigned }}/{{ data.maleTotal }}</el-tag>
+                    <el-tag size="small" class="female-tag ml-2">女:{{ data.femaleAssigned }}/{{ data.femaleTotal }}</el-tag>
+                  </template>
+                </span>
+              </div>
+            </template>
+          </el-tree>
+        </el-card>
+
+        <!-- 学生树 -->
+        <el-card shadow="hover" class="tree-card mt-4">
+          <div class="card-header-title">学生信息</div>
+          <el-input
+            v-model="studentSearchKey"
+            prefix-icon="Search"
+            placeholder="请输入关键词搜索"
+            clearable
+            @clear="watchStudentSearch"
+            @keyup.enter="watchStudentSearch"
+          >
+          </el-input>
+          <el-tree
+            ref="studentTreeRef"
+            class="mt-2"
+            node-key="id"
+            :data="studentTreeData"
+            :props="{ label: (data) => data.label, children: 'children' }"
+            :expand-on-click-node="false"
+            :filter-node-method="filterStudentNode"
+            highlight-current
+            default-expand-all
+            @node-click="handleStudentNodeClick"
+          >
+            <template #default="{ node, data }">
+              <span class="custom-tree-node">
+                <span>{{ node.label }}</span>
+                <span v-if="data.type === 'college' || data.type === 'major' || data.type === 'class'" class="bed-count">
+                  <template v-if="selectedBuilding?.buildingType === '2'">
+                    <el-tag size="small" class="female-tag ml-2">女:{{ data.femaleAssigned }}/{{ data.femaleTotal }}</el-tag>
+                    <el-tag size="small" type="primary" class="ml-2">男:{{ data.maleAssigned }}/{{ data.maleTotal }}</el-tag>
+                  </template>
+                  <template v-else>
+                    <el-tag size="small" type="primary" class="ml-2">男:{{ data.maleAssigned }}/{{ data.maleTotal }}</el-tag>
+                    <el-tag size="small" class="female-tag ml-2">女:{{ data.femaleAssigned }}/{{ data.femaleTotal }}</el-tag>
+                  </template>
+                </span>
+              </span>
+            </template>
+          </el-tree>
+        </el-card>
+      </div>
+
+      <div class="content-area">
+        <transition :enter-active-class="animate.searchAnimate.enter" :leave-active-class="animate.searchAnimate.leave">
+          <div v-show="showSearch" class="mb-[10px]">
+            <el-card shadow="hover">
+              <el-form ref="queryFormRef" :model="queryParams" inline>
+                <el-form-item label="房间号" prop="roomName">
+                  <el-input v-model="queryParams.roomName" placeholder="请输入房间号" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="状态" prop="roomStatus">
+                  <el-select v-model="queryParams.roomStatus" placeholder="房间状态" clearable>
+                    <el-option label="正常" value="0" />
+                    <el-option label="维修中" value="1" />
+                    <el-option label="停用" value="2" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-form>
+            </el-card>
+          </div>
+        </transition>
+
+        <el-card v-if="!selectedBuilding" shadow="hover" class="empty-tip">
+          <div class="flex flex-col items-center justify-center h-[400px]">
+            <el-icon class="text-gray-400 text-5xl mb-4"><InfoFilled /></el-icon>
+            <p class="text-gray-500 text-lg">请在左侧选择宿舍楼</p>
+          </div>
+        </el-card>
+
+        <template v-else>
+          <el-card shadow="hover" class="mb-4">
+            <template #header>
+              <el-row>
+                <el-col :span="12">
+                  <el-button type="primary" icon="check" size="small" @click="handleAddRoom">分配给二级学院</el-button>
+                  <el-button type="warning" icon="RefreshLeft" size="small" @click="handleBatchRecall">批量收回宿舍</el-button>
+                </el-col>
+                <el-col :span="12" style="text-align: right">
+                  <el-button
+                    link
+                    type="primary"
+                    size="small"
+                    :loading="expandAllLoading"
+                    :disabled="expandAllLoading || selectionLoading || loading"
+                    @click="expandAll"
+                    >全部展开</el-button
+                  >
+                  <el-button
+                    link
+                    type="primary"
+                    size="small"
+                    :loading="collapseAllLoading"
+                    :disabled="collapseAllLoading || selectionLoading || loading"
+                    @click="collapseAll"
+                    >全部收起</el-button
+                  >
+                </el-col>
+              </el-row>
+            </template>
+
+            <!-- 操作按钮 -->
+            <div class="mb-4">
+              <el-row>
+                <el-col :span="24">
+                  <div class="flex flex-wrap items-center gap-4">
+                    <span class="font-bold whitespace-nowrap"
+                      >{{ selectedBuilding?.label }}
+                      <span :class="selectedBuilding?.buildingType === '1' ? 'male-building' : 'female-building'">
+                        {{ selectedBuilding?.buildingType === '1' ? '（男生楼）' : '（女生楼）' }}
+                      </span>
+                      - 房间管理</span
+                    >
+                    <div class="text-blue-500 flex flex-wrap items-center gap-2">
+                      <span class="whitespace-nowrap"> 已选择: {{ selectedRoomCount }}个房间 / {{ selectedBedCount }}个床位 </span>
+                      <span v-if="selectedBedCount > 0" class="whitespace-nowrap text-sm">
+                        [可分配: <el-tag size="small" type="success">{{ selectedBedStats.available }}</el-tag
+                        >个, 已分配: <el-tag size="small" type="warning">{{ selectedBedStats.allocated }}</el-tag
+                        >个, 维修中: <el-tag size="small" type="danger">{{ selectedBedStats.maintenance }}</el-tag
+                        >个]
+                      </span>
+                      <span v-if="selectedRoomCount > 0 || selectedBedCount > 0" class="text-gray-500 text-sm">
+                        (房间选择时会自动包含其下所有床位)
+                      </span>
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
+              <!-- <el-button type="primary" icon="Plus" @click="handleAddRoom">添加房间</el-button> -->
+            </div>
+
+            <!-- 房间及床位树形表格 -->
+            <el-table
+              ref="tableRef"
+              v-loading="loading || selectionLoading || expandAllLoading || collapseAllLoading"
+              element-loading-text="处理中..."
+              :data="roomList"
+              row-key="id"
+              border
+              :expand-row-keys="expandedRowKeys"
+              @expand-change="handleExpandChange"
+              :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+              table-layout="auto"
+              @selection-change="handleSelectionChange"
+              @select-all="handleSelectAll"
+              :row-class-name="getRowClassName"
+            >
+              <el-table-column type="selection" width="55" :selectable="checkSelectable" />
+              <el-table-column prop="roomName" label="房间/宿舍名称" min-width="160">
+                <template #default="scope">
+                  <span v-if="!scope.row.isBed">{{ scope.row.roomName }} (房间)</span>
+                  <span v-else>{{ scope.row.bedName }} (床位)</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="floorNum" label="楼层" width="80" align="center">
+                <template #default="scope">
+                  <span v-if="!scope.row.isBed">{{ scope.row.floorNum }}</span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="类型" width="120" align="center">
+                <template #default="scope">
+                  <template v-if="!scope.row.isBed">
+                    <span>{{ scope.row.roomType === '1' ? '标准间' : scope.row.roomType === '2' ? '单人间' : '套间' }}</span>
+                  </template>
+                  <template v-else>
+                    <el-tag v-if="scope.row.bedType === '1'" type="success" size="small">下铺</el-tag>
+                    <el-tag v-else-if="scope.row.bedType === '2'" type="warning" size="small">上铺</el-tag>
+                    <el-tag v-else-if="scope.row.bedType === '3'" type="danger" size="small">中铺</el-tag>
+                    <el-tag v-else type="info" size="small">独立床</el-tag>
+                  </template>
+                </template>
+              </el-table-column>
+              <el-table-column label="状态" width="120" align="center">
+                <template #default="scope">
+                  <template v-if="!scope.row.isBed">
+                    <div class="flex flex-col items-center gap-1">
+                      <el-tag v-if="scope.row.roomStatus === '0'" type="success">正常</el-tag>
+                      <el-tag v-else-if="scope.row.roomStatus === '1'" type="warning">维修中</el-tag>
+                      <el-tag v-else type="danger">停用</el-tag>
+                      <!-- 房间床位占用状态 -->
+                      <span v-if="scope.row.roomStatus === '0'" class="text-xs text-gray-500"> ({{ getRoomBedStatusText(scope.row) }}) </span>
+                    </div>
+                  </template>
+                  <template v-else>
+                    <el-tag v-if="scope.row.bedStatus === '0'" type="success">空闲</el-tag>
+                    <el-tag v-else-if="scope.row.bedStatus === '1'" type="warning">已分配</el-tag>
+                    <el-tag v-else type="danger">维修中</el-tag>
+                  </template>
+                </template>
+              </el-table-column>
+              <!-- 新增学院信息列 -->
+              <el-table-column label="学院" width="120" align="center">
+                <template #default="scope">
+                  <span v-if="scope.row.isBed && scope.row.collegeName">{{ scope.row.collegeName }}</span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <!-- 新增专业信息列 -->
+              <el-table-column label="专业" width="120" align="center">
+                <template #default="scope">
+                  <span v-if="scope.row.isBed && scope.row.majorName">{{ scope.row.majorName }}</span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <!-- 新增班级信息列 -->
+              <el-table-column label="班级" width="120" align="center">
+                <template #default="scope">
+                  <span v-if="scope.row.isBed && scope.row.className">{{ scope.row.className }}</span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <!-- 新增学号信息列 -->
+              <el-table-column label="学号" width="120" align="center">
+                <template #default="scope">
+                  <span v-if="scope.row.isBed && scope.row.studentNo">{{ scope.row.studentNo }}</span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <!-- 新增学生姓名列 -->
+              <el-table-column label="学生姓名" width="100" align="center">
+                <template #default="scope">
+                  <span v-if="scope.row.isBed && scope.row.studentName">{{ scope.row.studentName }}</span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <!-- 新增性别列 -->
+              <el-table-column label="性别" width="60" align="center">
+                <template #default="scope">
+                  <span v-if="scope.row.isBed && scope.row.studentGender !== undefined">
+                    <el-tag v-if="scope.row.studentGender === '0'" type="primary" size="small">男</el-tag>
+                    <el-tag v-else-if="scope.row.studentGender === '1'" class="female-tag" size="small">女</el-tag>
+                  </span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="remark" label="备注" min-width="150" :show-overflow-tooltip="true">
+                <template #default="scope">
+                  {{ scope.row.remark || scope.row.bedRemark }}
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="180" align="center" fixed="right">
+                <template #default="scope">
+                  <template v-if="!scope.row.isBed">
+                    <!-- <el-button type="primary" link icon="Plus" @click="handleAddBed(scope.row)" /> -->
+                    <el-button type="primary" link icon="Edit" @click="handleEditRoom(scope.row)" />
+                    <el-button type="danger" link icon="Delete" @click="handleDeleteRoom(scope.row)" />
+                  </template>
+                  <template v-else>
+                    <el-button type="primary" link icon="Edit" @click="handleEditBed(scope.row)" />
+                    <el-button type="danger" link icon="Delete" @click="handleDeleteBed(scope.row)" />
+                  </template>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </template>
+      </div>
+    </div>
+
+    <!-- 房间管理对话框 -->
+    <room-dialog
+      v-model="roomDialog.visible"
+      :title="roomDialog.title"
+      :room-id="roomDialog.roomId"
+      :floor-num="roomDialog.floorNum"
+      :building-id="roomDialog.buildingId"
+      :room="roomDialog.room"
+      @success="handleRoomSuccess"
+    />
+
+    <!-- 床位表单对话框 -->
+    <bed-dialog
+      v-model="bedDialog.visible"
+      :title="bedDialog.title"
+      :bed-id="bedDialog.bedId"
+      :room-id="bedDialog.roomId"
+      @success="handleBedSuccess"
+    />
+
+    <!-- 学院分配对话框 -->
+    <college-allocation-dialog
+      v-model="collegeAllocationDialog.visible"
+      :title="collegeAllocationDialog.title"
+      :selected-beds="collegeAllocationDialog.selectedBeds"
+      :building-info="collegeAllocationDialog.buildingInfo"
+      @success="handleCollegeAllocationSuccess"
+    />
+  </div>
+</template>
+
+<script setup name="DormRoomTreeManagement" lang="ts">
+import { ref, computed, reactive, onMounted, nextTick, watch, getCurrentInstance } from 'vue';
+import { InfoFilled } from '@element-plus/icons-vue';
+import type { DormBuildingTreeVO } from '@/api/xg/xgss/dormBedStudent/dormBedStudent/types';
+import type { DormTreeNode, BedInfo } from '@/api/xg/xgss/xsssfjgl/types';
+import type { DormRoomVO } from '@/api/xg/xgss/dormRoom/types';
+import type { DormBedDetailVO } from '@/api/xg/xgss/dormBed/types';
+import type { XgStudentTreeVO } from '@/api/xg/xsjcxx/studentMsg/types';
+import { getCurrentUserCollegeDormTree } from '@/api/xg/xgss/dormBedStudent/dormBedStudent';
+import { getBedDetailsByRoomId, delDormBed, getDormBed } from '@/api/xg/xgss/dormBed';
+import { listDormRoom, delDormRoom } from '@/api/xg/xgss/dormRoom';
+import { getCurrentUserStudentTree } from '@/api/xg/xsjcxx/studentMsg';
+import ElMessage from 'element-plus/es/components/message/index';
+import ElMessageBox from 'element-plus/es/components/message-box/index';
+
+// 引入子组件
+import RoomDialog from './components/RoomDialog.vue';
+import BedDialog from './components/BedDialog.vue';
+import CollegeAllocationDialog from './components/CollegeAllocationDialog.vue';
+import { batchRecallDormBeds } from '@/api/xg/xgss/dormBedStudent/dormBedStudent';
+
+// const { proxy } = getCurrentInstance();
+
+// 组件状态
+const dormTreeRef = ref();
+const queryFormRef = ref();
+const tableRef = ref();
+const buildingName = ref('');
+const showSearch = ref(true);
+const loading = ref(false);
+const expandedRowKeys = ref<string[]>([]);
+
+// 加载状态：展开/收起/选择
+const expandAllLoading = ref(false);
+const collapseAllLoading = ref(false);
+const selectionLoading = ref(false);
+
+// 小延迟，确保加载动画先渲染
+const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
+
+// 选择状态
+const selectedRows = ref<any[]>([]);
+const selectedRoomCount = ref(0);
+const selectedBedCount = ref(0);
+// 床位状态统计
+const selectedBedStats = ref({
+  available: 0, // 可分配床位（空闲）
+  allocated: 0, // 已分配床位
+  maintenance: 0 // 维修中床位
+});
+
+const animate = reactive({
+  searchAnimate: {
+    enter: 'animate__animated animate__fadeInDown',
+    leave: 'animate__animated animate__fadeOutUp'
+  }
+});
+
+// 宿舍树数据
+const dormOptions = ref<DormTreeNode[]>([]);
+const selectedBuilding = ref<DormTreeNode>();
+
+// 房间和床位数据（合并展示）
+const roomList = ref<any[]>([]);
+
+// 添加请求取消控制器
+let currentController: AbortController | null = null;
+
+// 床位到房间的映射缓存，优化性能
+const bedToRoomMap = ref<Map<string, any>>(new Map());
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10000,
+  buildingId: undefined as string | number | undefined,
+  roomName: '',
+  roomStatus: undefined as string | undefined
+});
+
+// 房间对话框
+const roomDialog = reactive({
+  visible: false,
+  title: '',
+  roomId: undefined as string | number | undefined,
+  floorNum: 1,
+  buildingId: '' as string | number,
+  room: undefined as DormRoomVO | undefined
+});
+
+// 床位表单对话框
+const bedDialog = reactive({
+  visible: false,
+  title: '',
+  bedId: undefined as string | number | undefined,
+  roomId: '' as string | number
+});
+
+// 学院分配对话框
+const collegeAllocationDialog = reactive({
+  visible: false,
+  title: '分配床位给二级学院',
+  selectedBeds: [] as any[],
+  buildingInfo: undefined as DormTreeNode | undefined
+});
+
+// 学生树相关数据
+const studentTreeRef = ref();
+const studentSearchKey = ref('');
+const studentTreeData = ref<XgStudentTreeVO[]>([]);
+
+/** 通过条件过滤节点 */
+const filterNode = (value: string, data: DormTreeNode) => {
+  if (!value) return true;
+  return data.label.toLowerCase().indexOf(value.toLowerCase()) !== -1;
+};
+
+/** 通过条件过滤学生节点 */
+const filterStudentNode = (value: string, data: any) => {
+  if (!value) return true;
+  return data.label.toLowerCase().indexOf(value.toLowerCase()) !== -1;
+};
+
+/** 监听宿舍楼名称变化，筛选树 */
+const watchBuildingName = () => {
+  dormTreeRef.value?.filter(buildingName.value);
+};
+
+/** 监听学生树搜索输入变化 */
+const watchStudentSearch = () => {
+  studentTreeRef.value?.filter(studentSearchKey.value);
+};
+
+// 监听buildingName变化，实时筛选宿舍楼
+watch(buildingName, () => {
+  watchBuildingName();
+});
+
+/** 获取宿舍树数据 */
+const getDormTreeData = async () => {
+  try {
+    console.log('获取当前用户二级学院宿舍楼树');
+    const res = await getCurrentUserCollegeDormTree();
+
+    // 处理树节点数据，将DormBuildingTreeVO转换为DormTreeNode格式
+    const processTreeNodes = (nodes: any[]) => {
+      return nodes.map((node) => {
+        const processedNode = {
+          id: node.id,
+          label: node.label,
+          type: node.type,
+          disabled: node.disabled || false,
+          buildingType: node.buildingType,
+          buildingFloors: node.buildingFloors,
+          children: node.children ? processTreeNodes(node.children) : []
+        };
+
+        return processedNode;
+      });
+    };
+
+    dormOptions.value = processTreeNodes(res.data || []);
+  } catch (error) {
+    console.error('获取当前用户二级学院宿舍楼树失败', error);
+  }
+};
+
+/** 处理节点单击事件 - 增加请求取消机制 */
+const handleNodeClick = (data: DormTreeNode) => {
+  if (data.type !== 'building') {
+    // 如果不是宿舍楼，不进行操作
+    return;
+  }
+
+  // 取消之前未完成的请求
+  if (currentController) {
+    currentController.abort();
+    currentController = null;
+  }
+
+  // 设置选中的宿舍楼
+  selectedBuilding.value = data;
+  // 更新查询参数
+  queryParams.buildingId = data.id;
+  // 加载房间数据
+  handleQuery();
+};
+
+/** 查询房间数据 */
+const handleQuery = () => {
+  // 创建新的AbortController
+  currentController = new AbortController();
+  loadRoomData();
+};
+
+/** 学生树节点点击处理 */
+const handleStudentNodeClick = (data: any) => {
+  console.log('学生树节点点击:', data);
+  // 这里可以实现学生节点点击后的相关功能
+};
+
+/** 重置查询条件 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  if (selectedBuilding.value) {
+    queryParams.buildingId = selectedBuilding.value.id;
+  }
+  handleQuery();
+};
+
+/** 加载房间数据 - 使用新的床位详细信息API */
+const loadRoomData = async () => {
+  if (!queryParams.buildingId) return;
+
+  loading.value = true;
+  const controller = currentController;
+
+  try {
+    // 获取房间列表
+    const res = await listDormRoom({
+      ...queryParams
+    });
+    const rooms = res.rows || [];
+
+    if (controller?.signal?.aborted) return;
+
+    // 并行获取所有房间的床位详细信息
+    const roomPromises = rooms.map(async (room) => {
+      // 创建房间记录
+      const roomRecord = {
+        ...room,
+        isBed: false,
+        children: []
+      };
+
+      try {
+        const bedDetailRes = await getBedDetailsByRoomId(room.id);
+
+        // 如果请求已被取消，不继续处理
+        if (controller?.signal?.aborted) return roomRecord;
+
+        // 将床位详细信息添加为房间的子项
+        if (bedDetailRes.data?.length > 0) {
+          roomRecord.children = bedDetailRes.data.map((bedDetail: DormBedDetailVO) => ({
+            ...bedDetail,
+            isBed: true,
+            roomName: room.roomName // 保留房间名称，方便展示
+          }));
+        }
+      } catch (error: any) {
+        // 忽略请求被取消的错误
+        if (error.name !== 'AbortError') {
+          console.error(`获取房间 ${room.id} 的床位详细信息失败`, error);
+        }
+      }
+
+      return roomRecord;
+    });
+
+    // 等待所有请求完成
+    const tempList = await Promise.all(roomPromises);
+
+    // 如果请求已被取消，不更新UI
+    if (controller?.signal?.aborted) return;
+
+    roomList.value = tempList;
+
+    // 构建床位到房间的映射缓存
+    buildBedToRoomMap();
+
+    // 清除可选行缓存，强制重新计算
+    selectableRowsCache.value = [];
+
+    // 重置选择状态
+    isUpdatingSelection.value = true;
+    try {
+      selectedRows.value = [];
+      selectedRoomCount.value = 0;
+      selectedBedCount.value = 0;
+      selectedBedStats.value = { available: 0, allocated: 0, maintenance: 0 };
+
+      // 确保表格选择状态与数据一致
+      nextTick(() => {
+        // 清除所有选择，避免不可选行被选中
+        tableRef.value?.clearSelection();
+      });
+    } finally {
+      isUpdatingSelection.value = false;
+    }
+  } catch (error: any) {
+    // 忽略请求被取消的错误
+    if (error.name !== 'AbortError') {
+      console.error('加载房间数据失败', error);
+    }
+  } finally {
+    // 如果是当前控制器的请求完成，则关闭加载状态
+    if (controller === currentController) {
+      loading.value = false;
+    }
+  }
+};
+
+/** 分配给二级学院 */
+const handleAddRoom = () => {
+  if (!selectedBuilding.value) {
+    ElMessage.warning('请先选择宿舍楼');
+    return;
+  }
+
+  // 过滤出选中的床位（只要床位，不要房间）
+  const selectedBeds = selectedRows.value.filter((row) => row.isBed);
+
+  if (selectedBeds.length === 0) {
+    ElMessage.warning('请先选择要分配的床位');
+    return;
+  }
+
+  // 准备分配对话框数据
+  collegeAllocationDialog.selectedBeds = selectedBeds;
+  collegeAllocationDialog.buildingInfo = selectedBuilding.value;
+  collegeAllocationDialog.visible = true;
+};
+
+/** 批量收回宿舍 */
+const handleBatchRecall = async () => {
+  if (!selectedBuilding.value) {
+    ElMessage.warning('请先选择宿舍楼');
+    return;
+  }
+  const selectedBeds = selectedRows.value.filter((row) => row.isBed).map((row) => row.id);
+  if (selectedBeds.length === 0) {
+    ElMessage.warning('请先选择要收回的床位');
+    return;
+  }
+  try {
+    const content = `确认收回选中的 ${selectedBeds.length} 个床位吗？\n\n重要提示：回收后，学生已分配的宿舍都会回收，无法恢复`;
+    await ElMessageBox.confirm(content, '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    });
+  } catch {
+    return;
+  }
+  try {
+    await batchRecallDormBeds({ bedIds: selectedBeds });
+    ElMessage.success('批量收回成功');
+    // 刷新数据
+    selectableRowsCache.value = [];
+    loadRoomData();
+  } catch (e) {
+    ElMessage.error('批量收回失败');
+    console.error(e);
+  }
+};
+
+/** 全部展开 */
+const expandAll = async () => {
+  if (expandAllLoading.value || selectionLoading.value || !roomList.value?.length) return;
+  expandAllLoading.value = true;
+  await nextTick();
+  await delay(16);
+  expandedRowKeys.value = roomList.value.map((room) => String(room.id));
+  await nextTick();
+  expandAllLoading.value = false;
+};
+
+/** 全部收起 */
+const collapseAll = async () => {
+  if (collapseAllLoading.value || selectionLoading.value) return;
+  collapseAllLoading.value = true;
+  await nextTick();
+  await delay(16);
+  expandedRowKeys.value = [];
+  await nextTick();
+  collapseAllLoading.value = false;
+};
+
+/** 编辑房间 */
+const handleEditRoom = (row: any) => {
+  roomDialog.title = '编辑房间';
+  roomDialog.roomId = row.id;
+  roomDialog.floorNum = row.floorNum;
+  roomDialog.buildingId = row.buildingId;
+  roomDialog.room = { ...row };
+  roomDialog.visible = true;
+};
+
+/** 删除房间 */
+const handleDeleteRoom = (row: any) => {
+  ElMessageBox.confirm(`确定删除房间 ${row.roomName} 吗？`, '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async () => {
+      try {
+        await delDormRoom(row.id);
+        ElMessage.success('删除成功');
+        loadRoomData(); // 刷新数据
+      } catch (error) {
+        console.error('删除房间失败', error);
+      }
+    })
+    .catch(() => {});
+};
+
+/** 房间操作成功回调 */
+const handleRoomSuccess = () => {
+  // 清除缓存，确保数据刷新
+  selectableRowsCache.value = [];
+  loadRoomData();
+};
+
+/** 添加床位 */
+const handleAddBed = (row: any) => {
+  bedDialog.title = '添加床位';
+  bedDialog.bedId = undefined;
+  bedDialog.roomId = row.roomId;
+  bedDialog.visible = true;
+};
+
+/** 编辑床位 */
+const handleEditBed = (row: any) => {
+  bedDialog.title = '编辑床位';
+  bedDialog.bedId = row.id;
+  bedDialog.roomId = row.roomId;
+  bedDialog.visible = true;
+};
+
+/** 删除床位 */
+const handleDeleteBed = (row: any) => {
+  ElMessageBox.confirm(`确定删除床位 ${row.bedName} 吗？`, '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async () => {
+      try {
+        await delDormBed(row.id);
+        ElMessage.success('删除成功');
+        loadRoomData(); // 刷新数据
+      } catch (error) {
+        console.error('删除床位失败', error);
+      }
+    })
+    .catch(() => {});
+};
+
+/** 床位操作成功回调 */
+const handleBedSuccess = () => {
+  // 清除缓存，确保数据刷新
+  selectableRowsCache.value = [];
+  loadRoomData();
+};
+
+/** 学院分配成功回调 */
+const handleCollegeAllocationSuccess = () => {
+  // 清除缓存，确保数据刷新
+  selectableRowsCache.value = [];
+  // 刷新房间和床位数据
+  loadRoomData();
+  // 清空选择状态
+  isUpdatingSelection.value = true;
+  try {
+    selectedRows.value = [];
+    selectedRoomCount.value = 0;
+    selectedBedCount.value = 0;
+    selectedBedStats.value = { available: 0, allocated: 0, maintenance: 0 };
+  } finally {
+    isUpdatingSelection.value = false;
+  }
+};
+
+/** 处理行的展开/收起 */
+const handleExpandChange = (row: any, expanded: boolean) => {
+  const expandKey = String(row.id);
+  if (expanded) {
+    // 添加到已展开行数组
+    expandedRowKeys.value.push(expandKey);
+  } else {
+    // 从已展开行数组中移除
+    const index = expandedRowKeys.value.findIndex((key) => key === expandKey);
+    if (index !== -1) {
+      expandedRowKeys.value.splice(index, 1);
+    }
+  }
+};
+
+/** 检查行是否可选中（只有维修中和停用状态的房间及其床位不可选） */
+const checkSelectable = (row: any) => {
+  if (row.isBed) {
+    // 床位：只要其父房间不是维修中或停用状态就可选
+    const parentRoom = findParentRoom(row);
+    return parentRoom && parentRoom.roomStatus !== '1' && parentRoom.roomStatus !== '2';
+  } else {
+    // 房间：只有维修中(1)和停用(2)不可选
+    return row.roomStatus !== '1' && row.roomStatus !== '2';
+  }
+};
+
+/** 构建床位到房间的映射缓存 */
+const buildBedToRoomMap = () => {
+  const map = new Map();
+  roomList.value.forEach((room) => {
+    if (room.children && room.children.length > 0) {
+      room.children.forEach((bed: any) => {
+        map.set(bed.id, room);
+      });
+    }
+  });
+  bedToRoomMap.value = map;
+};
+
+/** 查找床位的父房间（优化版，使用缓存） */
+const findParentRoom = (bed: any) => {
+  return bedToRoomMap.value.get(bed.id);
+};
+
+/** 获取房间床位占用状态文本 */
+const getRoomBedStatusText = (room: any) => {
+  if (!room.children || room.children.length === 0) {
+    return '无床位';
+  }
+
+  const totalBeds = room.children.length;
+  const availableBeds = room.children.filter((bed: any) => bed.bedStatus === '0').length;
+  const allocatedBeds = room.children.filter((bed: any) => bed.bedStatus === '1').length;
+  const maintenanceBeds = room.children.filter((bed: any) => bed.bedStatus === '2').length;
+
+  if (availableBeds === totalBeds) {
+    return '空闲';
+  } else if (allocatedBeds === totalBeds) {
+    return '已满';
+  } else if (allocatedBeds > 0) {
+    // 修复：显示已分配的床位数量，而不是空闲的床位数量
+    return `部分占用(${allocatedBeds}/${totalBeds})`;
+  } else if (maintenanceBeds === totalBeds) {
+    return '全部维修';
+  } else {
+    return `混合状态(${allocatedBeds}/${totalBeds})`;
+  }
+};
+
+/** 获取行类名，用于区分房间和床位 */
+const getRowClassName = ({ row }: { row: any }) => {
+  if (!row.isBed) {
+    return 'room-row'; // 房间行
+  }
+  return 'bed-row'; // 床位行
+};
+
+/** 获取所有可选择的行（包括房间和床位） - 优化版 */
+const getAllSelectableRows = () => {
+  // 如果缓存存在且数据未变化，直接返回缓存
+  if (selectableRowsCache.value.length > 0) {
+    return selectableRowsCache.value;
+  }
+
+  const selectableRows: any[] = [];
+
+  roomList.value.forEach((room) => {
+    const isRoomSelectable = room.roomStatus !== '1' && room.roomStatus !== '2'; // 只有维修中和停用不可选
+
+    // 检查房间是否可选
+    if (isRoomSelectable) {
+      selectableRows.push(room);
+    }
+
+    // 检查房间下的床位是否可选
+    if (room.children && room.children.length > 0) {
+      room.children.forEach((bed: any) => {
+        // 床位：只要父房间可选就可选（不限制床位状态）
+        if (isRoomSelectable) {
+          selectableRows.push(bed);
+        }
+      });
+    }
+  });
+
+  // 缓存结果
+  selectableRowsCache.value = selectableRows;
+  return selectableRows;
+};
+
+// 添加可选行缓存
+const selectableRowsCache = ref<any[]>([]);
+
+/** 处理全选事件 */
+const handleSelectAll = async (selection: any[]) => {
+  if (selectionLoading.value) return;
+
+  selectionLoading.value = true;
+  // 避免在全选操作时触发联动逻辑
+  isUpdatingSelection.value = true;
+
+  try {
+    // 判断是全选还是取消全选
+    const isSelectAll = selection.length > 0;
+
+    await nextTick();
+    await delay(16);
+
+    if (isSelectAll) {
+      console.log('================>全选0');
+      // 全选操作：选择所有可用的行（包括房间和床位）
+      const availableRows = getAllSelectableRows();
+      console.log('================>availableRows', availableRows);
+      // 清空当前选择
+      tableRef.value?.clearSelection();
+
+      console.log('================>全选1');
+      // 批量选择所有可用行
+      availableRows.forEach((row) => {
+        tableRef.value?.toggleRowSelection(row, true);
+      });
+      console.log('================>全选2');
+      // 直接更新选择状态，避免等待事件触发
+      selectedRows.value = [...availableRows];
+      updateSelectionCount(availableRows);
+    } else {
+      console.log('================>取消全选1');
+      // 取消全选操作：清空所有选择
+      tableRef.value?.clearSelection();
+      console.log('================>取消全选2');
+      // 直接更新选择状态
+      selectedRows.value = [];
+      selectedRoomCount.value = 0;
+      selectedBedCount.value = 0;
+      selectedBedStats.value = { available: 0, allocated: 0, maintenance: 0 };
+    }
+  } finally {
+    isUpdatingSelection.value = false;
+    selectionLoading.value = false;
+  }
+};
+
+/** 更新选择统计 */
+const updateSelectionCount = (rows: any[]) => {
+  // 计算选中的房间和床位数量
+  // 注意：由于房间选择时会自动选择其下所有空闲床位，所以需要去重统计
+  const uniqueRooms = new Set();
+  const uniqueBeds = new Set();
+
+  // 床位状态统计
+  const bedStats = {
+    available: 0, // 可分配床位（空闲）bedStatus = '0'
+    allocated: 0, // 已分配床位 bedStatus = '1'
+    maintenance: 0 // 维修中床位 bedStatus = '2'
+  };
+
+  rows.forEach((row) => {
+    if (row.isBed) {
+      // 床位：记录床位ID并统计状态
+      uniqueBeds.add(row.id);
+      // 统计床位状态
+      if (row.bedStatus === '0') {
+        bedStats.available++;
+      } else if (row.bedStatus === '1') {
+        bedStats.allocated++;
+      } else if (row.bedStatus === '2') {
+        bedStats.maintenance++;
+      }
+    } else {
+      // 房间：记录房间ID
+      uniqueRooms.add(row.id);
+    }
+  });
+
+  // 统计选中的房间数（只统计直接选中的房间，不包括通过床位间接选中的房间）
+  selectedRoomCount.value = uniqueRooms.size;
+
+  // 统计选中的床位数（包括直接选中的床位和通过房间选择自动选中的床位）
+  selectedBedCount.value = uniqueBeds.size;
+
+  // 更新床位状态统计
+  selectedBedStats.value = bedStats;
+};
+
+// 添加一个标志位来避免循环触发
+const isUpdatingSelection = ref(false);
+
+/** 处理选择变更 */
+const handleSelectionChange = (rows: any[]) => {
+  // 避免在批量更新时重复处理
+  if (isUpdatingSelection.value) return;
+
+  // 处理房间选择联动逻辑
+  handleRoomBedSelection(rows);
+
+  // 更新选中行数组
+  selectedRows.value = rows;
+
+  // 更新统计
+  updateSelectionCount(rows);
+};
+
+/** 处理房间和床位的联动选择逻辑 */
+const handleRoomBedSelection = (currentSelection: any[]) => {
+  const previousSelection = selectedRows.value;
+
+  // 找出新增和移除的选择项
+  const addedItems = currentSelection.filter((current) => !previousSelection.some((prev) => prev.id === current.id && prev.isBed === current.isBed));
+  const removedItems = previousSelection.filter(
+    (prev) => !currentSelection.some((current) => current.id === prev.id && current.isBed === prev.isBed)
+  );
+
+  // 如果没有变化，直接返回
+  if (addedItems.length === 0 && removedItems.length === 0) {
+    return;
+  }
+
+  // 批量处理联动选择
+  isUpdatingSelection.value = true;
+
+  try {
+    // 处理新增的房间选择 - 自动选择其下所有可用床位
+    const addedRooms = addedItems.filter((item) => !item.isBed);
+    addedRooms.forEach((room) => {
+      selectRoomBeds(room, true);
+    });
+
+    // 处理移除的房间选择 - 自动取消选择其下所有床位
+    const removedRooms = removedItems.filter((item) => !item.isBed);
+    removedRooms.forEach((room) => {
+      selectRoomBeds(room, false);
+    });
+  } finally {
+    isUpdatingSelection.value = false;
+  }
+};
+
+/** 选择或取消选择房间下的所有可用床位 */
+const selectRoomBeds = (room: any, isSelected: boolean) => {
+  if (!room?.children?.length) return;
+
+  // 获取该房间下所有床位（不限制床位状态），只要房间可选
+  const availableBeds = room.children.filter((bed: any) => room.roomStatus !== '1' && room.roomStatus !== '2');
+
+  // 如果没有可用床位，直接返回
+  if (availableBeds.length === 0) return;
+
+  // 批量处理床位选择 - 避免在每次操作时触发事件
+  availableBeds.forEach((bed: any) => {
+    tableRef.value?.toggleRowSelection(bed, isSelected);
+  });
+};
+
+// 获取学生信息树数据
+const getStudentTreeData = async () => {
+  try {
+    const res = await getCurrentUserStudentTree(); // 获取当前用户所在学院的学生信息树
+    if (res.code === 200) {
+      studentTreeData.value = res.data || [];
+    } else {
+      ElMessage.error(res.msg || '获取学生信息树失败');
+    }
+  } catch (error) {
+    console.error('获取学生信息树失败:', error);
+    ElMessage.error('获取学生信息树失败');
+  }
+};
+
+// 组件挂载时获取宿舍树数据和学生树数据
+onMounted(() => {
+  getDormTreeData();
+  getStudentTreeData();
+  if (currentController) {
+    currentController.abort();
+    currentController = null;
+  }
+});
+</script>
+
+<style scoped>
+.flex-layout {
+  display: flex;
+  gap: 16px;
+}
+
+.tree-sidebar {
+  width: 300px;
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.tree-card {
+  flex: 1;
+  max-height: calc(50vh - 24px);
+  display: flex;
+  flex-direction: column;
+}
+
+.tree-card :deep(.el-card__body) {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: auto; /* 添加横向滚动 */
+  padding-top: 10px;
+}
+
+.content-area {
+  flex-grow: 1;
+  overflow: visible; /* 允许表格正常显示 */
+  min-width: 0; /* 防止flex子项溢出 */
+}
+
+.room-container {
+  margin-top: 16px;
+}
+
+/* 表格容器样式优化 */
+.el-card {
+  overflow: visible !important;
+}
+
+/* 确保表格列宽度合理分配 */
+.el-table :deep(.el-table__cell) {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 固定列样式优化 */
+.el-table :deep(.el-table__fixed-right) {
+  box-shadow: -2px 0 8px rgba(0, 0, 0, 0.1);
+}
+
+.empty-tip {
+  height: 100%;
+}
+
+/* 修复表格横向滚动样式 - 解决双滚动条问题 */
+.el-card :deep(.el-table) {
+  width: 100% !important;
+  overflow: visible !important;
+}
+
+.el-card :deep(.el-table__body-wrapper) {
+  overflow-x: auto !important;
+  overflow-y: auto !important;
+}
+
+/* 确保表格头部不出现横向滚动条 */
+.el-card :deep(.el-table__header-wrapper) {
+  overflow: visible !important;
+}
+
+/* 设置表格内容区域的最小宽度，避免右侧空白 */
+.el-card :deep(.el-table__body),
+.el-card :deep(.el-table__header) {
+  min-width: 100%;
+  width: 100%;
+}
+
+/* 确保表格容器正确处理滚动 */
+.el-card :deep(.el-table__inner-wrapper) {
+  overflow: visible !important;
+}
+
+/* 统计信息区域样式优化 */
+.flex-layout .content-area .el-card .mb-4 .flex {
+  min-width: 0;
+}
+
+.flex-layout .content-area .el-card .mb-4 .flex .font-bold {
+  flex-shrink: 0;
+}
+
+.flex-layout .content-area .el-card .mb-4 .flex .text-blue-500 {
+  flex-shrink: 0;
+  min-width: 0;
+}
+
+/* 确保说明文字不换行 */
+.flex-layout .content-area .el-card .mb-4 .flex .text-gray-500 {
+  white-space: nowrap;
+  flex-shrink: 0;
+}
+
+/* 学生树自定义样式 */
+.card-header-title {
+  font-weight: bold;
+  margin-bottom: 10px;
+  font-size: 16px;
+  color: var(--el-color-primary);
+}
+
+.custom-tree-node {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  align-items: center;
+  min-width: max-content; /* 确保内容不被压缩 */
+}
+
+.bed-count {
+  font-size: 12px;
+  white-space: nowrap;
+}
+
+/* 学生树横向和纵向滚动样式 - 修复版 */
+.tree-card.mt-4 {
+  position: relative;
+}
+
+/* 学生树卡片内容区域的滚动行为 - 使用嵌套滚动容器解决滚动条问题 */
+.tree-card.mt-4 :deep(.el-card__body) {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  padding: 10px !important;
+  max-height: calc(50vh - 24px); /* 设置最大高度 */
+  overflow: hidden; /* 避免双重滚动条 */
+}
+
+/* 创建一个包装容器进行纵向滚动 */
+.tree-card.mt-4 :deep(.el-input) {
+  flex-shrink: 0; /* 防止搜索框被压缩 */
+  margin-bottom: 10px;
+}
+
+/* 添加自定义滚动容器 */
+.tree-card.mt-4 :deep(.el-tree) {
+  overflow-y: auto; /* 纵向滚动 */
+  overflow-x: auto; /* 横向滚动 */
+  max-width: 100%; /* 确保不超出父容器 */
+  min-width: 100%; /* 确保至少占满容器宽度 */
+  padding-bottom: 10px; /* 为横向滚动条留出空间 */
+  display: inline-block; /* 使容器能够根据内容扩展 */
+  width: max-content; /* 允许根据内容扩展宽度 */
+}
+
+/* 确保学生树节点内容完整显示 */
+.tree-card.mt-4 :deep(.el-tree-node) {
+  min-width: max-content;
+  white-space: nowrap;
+}
+
+.tree-card.mt-4 :deep(.el-tree-node__content) {
+  min-width: max-content;
+  width: auto !important;
+}
+
+.disabled-node {
+  cursor: not-allowed;
+}
+
+.male-building {
+  color: var(--el-color-primary);
+  font-weight: bold;
+}
+
+.female-building {
+  color: #ff69b4; /* 粉色 */
+  font-weight: bold;
+}
+
+/* 女生标签样式 */
+.female-tag {
+  background-color: rgba(255, 105, 180, 0.1) !important;
+  color: #ff69b4 !important;
+  border-color: rgba(255, 105, 180, 0.1) !important;
+}
+
+/* 宿舍树横向和纵向滚动样式 - 修复版 */
+.tree-card:first-child {
+  position: relative;
+}
+
+/* 宿舍树卡片内容区域的滚动行为 - 使用嵌套滚动容器解决滚动条问题 */
+.tree-card:first-child :deep(.el-card__body) {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  padding: 10px !important;
+  max-height: calc(50vh - 24px); /* 设置最大高度 */
+  overflow: hidden; /* 避免双重滚动条 */
+}
+
+/* 创建一个包装容器进行纵向滚动 */
+.tree-card:first-child :deep(.el-input) {
+  flex-shrink: 0; /* 防止搜索框被压缩 */
+  margin-bottom: 10px;
+}
+
+/* 添加自定义滚动容器 */
+.tree-card:first-child :deep(.el-tree) {
+  overflow-y: auto; /* 纵向滚动 */
+  overflow-x: auto; /* 横向滚动 */
+  max-width: 100%; /* 确保不超出父容器 */
+  min-width: 100%; /* 确保至少占满容器宽度 */
+  padding-bottom: 10px; /* 为横向滚动条留出空间 */
+  display: inline-block; /* 使容器能够根据内容扩展 */
+  width: max-content; /* 允许根据内容扩展宽度 */
+}
+
+/* 确保宿舍树节点内容完整显示 */
+.tree-card:first-child :deep(.el-tree-node) {
+  min-width: max-content;
+  white-space: nowrap;
+}
+
+.tree-card:first-child :deep(.el-tree-node__content) {
+  min-width: max-content;
+  width: auto !important;
+}
+
+/* 房间行样式 - 使用更高优先级的选择器 */
+.el-table :deep(.room-row) {
+  background-color: #eefeff !important; /* 浅蓝色背景，区分房间 */
+}
+
+/* 床位行样式 - 使用更高优先级的选择器 */
+.el-table :deep(.bed-row) {
+  background-color: #ffffff !important; /* 浅灰色背景 */
+}
+
+/* 确保行背景色在hover状态下也能保持 */
+.el-table :deep(.room-row:hover) {
+  background-color: #d1f0ff !important; /* 房间行hover时的深一点蓝色 */
+}
+
+.el-table :deep(.bed-row:hover) {
+  background-color: #e8f0f5 !important; /* 床位行hover时的深一点灰色 */
+}
+</style>