From 329e03ed69e419f7b598af77cc6c1b8aeb81f620 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 17 Nov 2020 10:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/app/controller/ResultRecordController.java  | 1 +
 .../com/lz/modules/flow/service/impl/FlowStartServiceImpl.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 0b23aaa7..5a2e87c6 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -712,6 +712,7 @@ public class ResultRecordController extends AbstractController {
                     resultDetail.setStaffId(resultRecord.getStaffId());
                     resultDetail.setRecordId(resultRecord.getId());
                     resultDetail.setType(model.getType());
+                    resultDetail.setModelId(model.getId());
                     inserts.add(resultDetail);
                 }
                 if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
index 70a38a8c..7dc9aa82 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
@@ -362,7 +362,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				BeanUtils.copyProperties(dto, resultModel);
 				resultModel.setId(null);
 				resultModelService.insertResultModel(resultModel);
-				dto.setId(resultModel.getId());
+
 				List<ResultTagetLibDto> libDtos = resultTagetLibService.selectResultTagetLibDtoByModelId(dto.getId());
 				dto.setTagetLibs(libDtos);
 				for (ResultTagetLibDto libDto: libDtos
@@ -374,6 +374,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 					resultTagetLib.setId(null);
 					resultTagetLibs.add(resultTagetLib);
 				}
+				dto.setId(resultModel.getId());
 			}
 			if(resultTagetLibs.size() > 0){
 				//插入备份的考评组指标信息