From c3941e00e606a1ebe278a9e8d35037cf23068e52 Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Thu, 15 Jan 2026 10:48:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E9=A2=84=E8=A7=88=E5=A2=9E=E5=8A=A0fileId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SimulationReportTemplateServiceImpl.java     |  1 +
 .../impl/SimulationSystemConfigServiceImpl.java       | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
index e6ee2fe8..b23a3c4e 100644
--- a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
+++ b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
@@ -164,6 +164,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
             return SdmResponse.failed("报告模版草稿不存在");
         } else {
             // 发起评审
+            templateDto.setFileId(reportTemplate.getFileId());
             SdmResponse approveRespond = launchApprove(templateDto);
             if (!approveRespond.isSuccess()) {
                 return SdmResponse.failed("发起评审失败");
diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
index b3791b9e..782df6af 100644
--- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
+++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
@@ -309,13 +309,14 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
     public SdmResponse addSystemFormConfigure(FormConfigure configure) {
         SdmResponse response = SdmResponse.success();
         Long tenantId = ThreadLocalContext.getTenantId();
+        Long userId = ThreadLocalContext.getUserId();
         if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).eq(SysFormConfigure::getTenantId, tenantId).list())) {
             response = SdmResponse.failed("该表单配置已存在");
         } else {
             SysFormConfigure sysFormConfigure = new  SysFormConfigure();
             BeanUtils.copyProperties(configure, sysFormConfigure);
             sysFormConfigure.setTenantId(tenantId);
-            sysFormConfigure.setCreator(ThreadLocalContext.getUserId());
+            sysFormConfigure.setCreator(userId);
             if (!formConfigureService.save(sysFormConfigure)) {
                 response = SdmResponse.failed("添加表单配置失败");
             }
@@ -329,9 +330,11 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
                 tenantIdList.forEach(i -> {
                     if (CollectionUtils.isEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName)
                             .eq(SysFormConfigure::getTenantId, i).list())) {
-                        sysFormConfigure.setId(null);
-                        sysFormConfigure.setTenantId(tenantId);
-                        formConfigureService.save(sysFormConfigure);
+                        SysFormConfigure formConfigure = new  SysFormConfigure();
+                        BeanUtils.copyProperties(configure, formConfigure);
+                        formConfigure.setTenantId(i);
+                        formConfigure.setCreator(userId);
+                        formConfigureService.save(formConfigure);
                     }
                 });
             }