From 6f783e6d70600e897716b70824a5f12bc649fde6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Mon, 16 Mar 2026 17:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=8D=E4=BF=9D=E7=95=99=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=8D=E7=94=B3=E8=AF=B7=E8=BE=85=E5=AF=BC=E5=91=98=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RtEnlistmentReserveServiceImpl.java       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
index dd91db5..b4c19b6 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.core.domain.entity.SysUser;
 import com.srs.common.doman.dto.ProcessResultDto;
 import com.srs.common.doman.vo.TeacherVo;
 import com.srs.common.exception.ServiceException;
@@ -16,6 +17,7 @@ import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
 import com.srs.dormitory.mapper.DmsOutsideAccommodationApplyMapper;
 import com.srs.flowable.service.IFlowDefinitionService;
 import com.srs.routine.domain.RtEnlistmentReserveApproval;
+import com.srs.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import com.srs.routine.mapper.RtStuLeaveApplicationMapper;
 import org.apache.commons.lang3.StringUtils;
@@ -53,6 +55,9 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
     @Autowired
     IdentityService identityService;
 
+    @Autowired
+    ISysUserService sysUserService;
+
 
     // 注入RuntimeService
     @Autowired
@@ -103,6 +108,11 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
             throw new ServiceException("您已经申请过了，请勿重新申请！", 400);
         }
 
+        SysUser sysUser = sysUserService.selectUserByUserName(rtEnlistmentReserve.getStudentNo());
+        if (sysUser == null) {
+            throw new ServiceException("该学生不存在", 500);
+        }
+
         // ========== 生成保留学籍编号 ==========
         // 查询申请记录数量
         List<RtEnlistmentReserve> rtEnlistmentReserves = rtEnlistmentReserveMapper.getEnlistmentReserves();
@@ -139,7 +149,9 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
         // 注意：若前端未传 applyStatus，数据库默认 0，不会触发流程
         if (1 == rtEnlistmentReserve.getApplyStatus()) {
             // 绑定当前学生 ID（提交人即学生本人，确保流程变量准确）
-            rtEnlistmentReserve.setStudentId(SecurityUtils.getUserId());
+            if (rtEnlistmentReserve.getStudentId() == null) {
+                rtEnlistmentReserve.setStudentId(SecurityUtils.getUserId());
+            }
 
             // 启动流程（此时 applyId 已存在，可正常传递）
             ProcessResultDto processResultDto = startEnlistmentReserveProcess(rtEnlistmentReserve);