From 6a25ce407c580d595abc071d39841e5fc4c1b779 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 8 Dec 2020 10:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=AE=9A=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E6=97=B6=E5=8F=AF=E8=83=BD=E7=9A=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResultRecordController.java    | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 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 ea322f40..e6b21e1e 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -777,45 +777,45 @@ public class ResultRecordController extends AbstractController {
                  ) {//排序
                 ResultDetail resultDetail = new ResultDetail();
                 BeanUtils.copyProperties(detailDto, resultDetail);
-
-                if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了
-                    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())){
-                        //这里判断是否有更新，或者删除
-                        boolean isUp = false;
-                        ResultDetail resultDetail1 = null;
-                        resultDetail1 = mapDetails.get(resultDetail.getId());
+                if(!isSetKeyResult){
+                    if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了
+                        resultDetail.setIsBack(2);
+                        resultDetail.setBackId(resultDetail.getId());
+                        updateResultDetails.add(resultDetail);
+                    }else if(resultDetail.getId() == null){
+                        resultDetail.setIsBack(3);//新增
+                    }else {
+                        if(resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){
+                            //这里判断是否有更新，或者删除
+                            boolean isUp = false;
+                            ResultDetail resultDetail1 = null;
+                            resultDetail1 = mapDetails.get(resultDetail.getId());
 
 
-                        if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
-                            //打上标识
-                            isUp = true;
-                        }
-                        if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
-                            //打上标识
-                            isUp = true;
-                        }
+                            if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
+                                //打上标识
+                                isUp = true;
+                            }
+                            if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
+                                //打上标识
+                                isUp = true;
+                            }
 
-                        if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
-                            //打上标识
-                            isUp = true;
-                        }
-                        if(isUp){
-                            resultDetail1.setId(null);
-                            resultDetail1.setIsBack(2);
-                            resultDetail1.setBackId(resultDetail.getId());
-                            inserts.add(resultDetail1);
+                            if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
+                                //打上标识
+                                isUp = true;
+                            }
+                            if(isUp){
+                                resultDetail1.setId(null);
+                                resultDetail1.setIsBack(2);
+                                resultDetail1.setBackId(resultDetail.getId());
+                                inserts.add(resultDetail1);
+                            }
                         }
                     }
-
-
                 }
 
+
                 resultDetail.setPriority(index);
 
                 index++;