From 2562b7c6085fe2c3969b1579743042bcd0904ece Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 21 Oct 2020 20:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87=E7=AD=89?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/controller/FlowChartController.java    |  5 ++++-
 .../performance/controller/ResultModelController.java  | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
index 2fe68112..f3f6948f 100644
--- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java
@@ -121,7 +121,10 @@ public class FlowChartController {
             }else{
                 inserts.add(flowChartDetailRecord);
             }
-            index++;
+            if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){
+                index++;
+            }
+
         }
         if(inserts.size() > 0){
             flowChartDetailRecordService.insertFlowChartDetailRecords(inserts);
diff --git a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
index d631bedf..c7139b1b 100644
--- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
@@ -108,8 +108,10 @@ public class ResultModelController {
                 }else{
                     inserts.add(resultTagetLib);
                 }
+                if(resultTagetLib.getIsDelete() == null || resultTagetLib.getIsDelete().intValue() == 0){
+                    libOrderBy++;
+                }
 
-                libOrderBy++;
             }
             if(inserts.size() > 0){
                 resultTagetLibService.insertResultTagetLibs(inserts);
@@ -117,7 +119,11 @@ public class ResultModelController {
             if(updates.size() > 0){
                 resultTagetLibService.updateBatchById(updates);
             }
-            resultModelOrderBy++;
+
+            if(resultModel.getIsDelete() == null || resultModel.getIsDelete().intValue() == 0){
+                resultModelOrderBy++;
+            }
+
         }
         return R.ok();
     }