From f2fb7854232d65164c10ac2fbe0aff3eb5c5ce00 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 7 Dec 2020 15:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/app/controller/ResultRecordController.java | 2 ++
 src/main/resources/mapper/app/ResultDetailMapper.xml          | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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 78a6b21b..2c3f0b82 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -781,6 +781,8 @@ public class ResultRecordController extends AbstractController {
                     resultDetail.setIsBack(2);
                     resultDetail.setBackId(resultDetail.getId());
                     updateResultDetails.add(resultDetail);
+                }else if(resultDetail.getId() == null){
+                    resultDetail.setIsBack(3);//新增
                 }else {
                     if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){
                         //这里判断是否有更新，或者删除
diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml
index 50f504c4..d5ac1dc0 100644
--- a/src/main/resources/mapper/app/ResultDetailMapper.xml
+++ b/src/main/resources/mapper/app/ResultDetailMapper.xml
@@ -196,7 +196,7 @@
     </insert>
 
     <select id="selectDtosByRecordId" resultType="com.lz.modules.flow.model.ResultDetailDto">
-        select * from lz_result_detail  where record_id=#{recordResultId} and model_id = #{modelId} and is_delete = 0 and is_back = 0 order by priority asc
+        select * from lz_result_detail  where record_id=#{recordResultId} and model_id = #{modelId} and is_delete = 0 and (is_back = 0 or is_back = 3) order by priority asc
     </select>
 
     <update id="deleteResultDetailByRecordId" parameterType="java.lang.Long">
@@ -208,7 +208,7 @@
     </select>
 
     <select id="selectNotNoticeResultDetailByRecordId" resultType="com.lz.modules.sys.entity.app.ResultDetail">
-        select * from lz_result_detail  where  record_id = #{recordId} and is_back = 2 order by priority asc
+        select * from lz_result_detail  where  record_id = #{recordId} and (is_back = 2 or is_back = 3) order by priority asc
     </select>
 
 </mapper>