From e5d35efd19ca8a63a9a6652ecf9b4ba766116666 Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Mon, 8 Dec 2025 16:04:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=90=E7=AE=97=E4=BE=8B=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF=E7=88=B6=E7=AE=97=E4=BE=8B=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sdm/project/model/req/KeyResultReq.java |  2 +-
 .../service/impl/SimulationRunServiceImpl.java  | 17 +++++++++++++++--
 .../impl/SimulationSystemConfigServiceImpl.java |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
index 8a24f83a..8dbbd79b 100644
--- a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
@@ -72,7 +72,7 @@ public class KeyResultReq extends BaseReq {
     private MultipartFile file;
 
     @Schema(description = "是否仅曲线上传文件")
-    private boolean onlyFile;
+    private boolean onlyFile = false;
 
     /**
      * -------------------------------------------------上传交付物使用参数------------------------------------------------
diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
index 73f2cf64..68541fb2 100644
--- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
@@ -578,6 +578,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
                 // 解析流程模板中的节点结构，初始化流程节点表
                 SdmResponse<FlowTemplateResp> flowTemplateResp = flowFeignClient.queryFlowTemplateInfo(simulationRun.getFlowTemplate());
                 if (flowTemplateResp.getData() != null) {
+                    simulationRun.setProcessDefinitionId(flowTemplateResp.getData().getProcessDefinitionId());
+                    this.updateById(simulationRun);
                     try {
                         List<FlowNodeDto> flowNodeDtoList = new ArrayList<>();
                         ProcessDefinitionDTO definitionDTO = JSON.parseObject(flowTemplateResp.getData().getTemplateContent(), ProcessDefinitionDTO.class);
@@ -609,12 +611,23 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
                         if (!flowFeignClient.batchAddSimulationFlowNode(addReq).isSuccess()) {
                             return SdmResponse.failed("新增流程节点失败:{}");
                         }
+                        // 子算例继承父算例的用户输入参数
+                        if (StringUtils.isNotBlank(simulationRun.getParentId())) {
+                            SimulationRun parentRun = this.lambdaQuery().eq(SimulationRun::getUuid, simulationRun.getParentId()).one();
+                            SdmResponse<ProcessInstanceDetailResponse> parentResp = flowableFeignClient.getProcessAndNodeDetailByInstanceId(parentRun.getProcessDefinitionId(), parentRun.getFlowInstanceId(), parentRun.getUuid());
+                            if (parentResp.getData() != null && CollectionUtils.isNotEmpty(parentResp.getData().getNodes())) {
+                                for (FlowNodeDto flowNodeDto : flowNodeDtoList) {
+                                    parentResp.getData().getNodes().stream().filter(i -> StringUtils.equals(i.getId(), flowNodeDto.getNodeId()) && ObjectUtils.isNotEmpty(i.getUserParam())).findFirst().ifPresent(i -> {
+                                        Map<String, Object> params = new HashMap<>(i.getUserParam());
+                                        flowableFeignClient.saveParamsByDefinitionId(simulationRun.getProcessDefinitionId(), flowNodeDto.getNodeId(), simulationRun.getUuid(), params);
+                                    });
+                                }
+                            }
+                        }
                     } catch (Exception e) {
                         log.error("解析流程模板json文件失败,flowTemplateId:{}", simulationRun.getFlowTemplate(), e);
                         throw new RuntimeException("解析流程模板json文件失败:" + e.getMessage(), e);
                     }
-                    simulationRun.setProcessDefinitionId(flowTemplateResp.getData().getProcessDefinitionId());
-                    this.updateById(simulationRun);
                 }
             }
             return SdmResponse.success(simulationRun.getUuid());
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 7c601a7b..f1d0f09c 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
@@ -366,7 +366,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
         queryWrapper.eq(SysFormConfigure::getTenantId, ThreadLocalContext.getTenantId());
         List<SysFormConfigure> list = formConfigureService.list(queryWrapper);
         if (CollectionUtils.isEmpty(list)) {
-            return SdmResponse.failed("自定义表单列表为空，请初始化");
+            return SdmResponse.success();
         }
 
         PageInfo<SysFormConfigure> page = new PageInfo<>(list);