From 4fd958c7211596fd839c32c0b5ad504bcd60b403 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 19 Nov 2020 18:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResultModelServiceImpl.java  | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java
index ed1f0acd..9aca6ff7 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java
@@ -129,7 +129,20 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 			resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());
 			resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId());
 			resultModel.setOrderBy(resultModelOrderBy);
+			if(resultModel.getWeight() == null){
+				resultModel.setWeight(BigDecimal.ZERO);
+			}
+			if(resultModel.getId() == null){
+				resultModelMapper.insertResultModel(resultModel);
 
+			}else{
+
+				resultModelMapper.updateResultModelById(resultModel);
+
+				if(resultModel.getIsDelete() != null && resultModel.getIsDelete().intValue() == 1){
+					delCount--;
+				}
+			}
 			if(itemReq.getTagetLibItems() != null){
 				int libOrderBy = 0;
 				List<ResultTagetLib> inserts = new ArrayList<>();
@@ -143,7 +156,7 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 					resultTagetLib.setOrderBy(libOrderBy);
 					if(req.getWeight() != null){
 						tagLibWeight = tagLibWeight.add(req.getWeight());
-						if(resultModel.getWeight() != null && tagLibWeight.compareTo(resultModel.getWeight()) == 1){
+						if(!resultModel.getWeight().equals(BigDecimal.ZERO) && tagLibWeight.compareTo(resultModel.getWeight()) == 1){
 							TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
 							return R.error(resultModel.getName() +
 									"维度的指标之和不能大于" + (resultModel.getWeight().multiply(BigDecimal.valueOf(100))) + "%");
@@ -171,18 +184,6 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 					resultModelOrderBy++;
 				}
 			}
-			if(resultModel.getId() == null){
-				resultModelMapper.insertResultModel(resultModel);
-
-			}else{
-				if(resultModel.getWeight() == null){
-					resultModel.setWeight(BigDecimal.ZERO);
-				}
-				resultModelMapper.updateResultModelById(resultModel);
-				if(resultModel.getIsDelete() != null && resultModel.getIsDelete().intValue() == 1){
-					delCount--;
-				}
-			}
 
 		}
 		/*if(delCount == 0){