From 3a902021551a37bb9ac01ebdabf1bbbc5c7fbb66 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 8 Jan 2026 16:20:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E9=A2=84=E5=A1=AB=E5=A1=AB=E6=8A=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E8=A1=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java   | 4 ++++
 .../com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java    | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
index 883ca98..aa10094 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
@@ -305,6 +305,10 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
     @Override
     public void tj(StudyFormApply studyFormApply) {
         //验证签名人密码 todo
+        if(studyFormApply.getId()==null){
+            studyFormApply.setUserId(SecurityUtils.getUserId());
+            studyFormApply.setUserMc(SecurityUtils.getNickName());
+        }
         studyFormApply.setBdzt(StudyFormApplyBdztEnum.ytj.getValue());
         studyFormApply.setTjsj(new Date());
         this.saveOrUpdate(studyFormApply);
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
index 380e0af..4f52a64 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
@@ -184,6 +184,10 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
     @Override
     public void tj(StudyFormPlan studyFormPlan) {
         //验证签名人密码 todo
+        if(studyFormPlan.getId()==null){
+            studyFormPlan.setUserId(SecurityUtils.getUserId());
+            studyFormPlan.setUserMc(SecurityUtils.getNickName());
+        }
         studyFormPlan.setBdzt(StudyFormPlanBdztEnum.ytj.getValue());
         studyFormPlan.setTjsj(new Date());
         this.saveOrUpdate(studyFormPlan);
@@ -274,6 +278,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
         if (!studyFormPlanOld.getBdzt().equals(StudyFormPlanBdztEnum.ywcfh.getValue())) {
             throw new ServiceException("表单不是已完成（经复核）状态，不能审阅");
         }
+        studyFormPlanOld.setBdnr(studyFormPlan.getBdnr());
+        this.updateById(studyFormPlanOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注",studyFormPlan.getRemark());