From dbfff058ff02cbe695c16df75cfb0ae822d1d013 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 3 Nov 2020 16:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AEmaxcount=E7=BB=99=E5=89=8D=E7=AB=AF=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/flow/service/impl/ResultModelServiceImpl.java   | 3 +++
 .../modules/performance/controller/ResultModelController.java  | 3 +++
 2 files changed, 6 insertions(+)

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 8529961d..fd3876c4 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
@@ -116,6 +116,9 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 			}
 			ResultModel resultModel = new ResultModel();
 			BeanUtils.copyProperties(itemReq, resultModel);
+			if(resultModel.getMaxCount() == null){
+				resultModel.setMaxCount(10000);
+			}
 			resultModel.setCalculateId(resultModelDetailReq.getCalculateId());
 			resultModel.setGradeGroupId(resultModelDetailReq.getGradeGroupId());
 			resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());
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 27801ced..bdd1c40f 100644
--- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
@@ -53,6 +53,9 @@ public class ResultModelController {
             resultModelDetailReq.setGradeGroupId(dto.getGradeGroupId());
             ResultModelItemReq itemReq = new ResultModelItemReq();
             BeanUtils.copyProperties(dto, itemReq);
+            if(dto.getMaxCount().intValue() == 10000){
+                itemReq.setMaxCount(null);
+            }
             List<ResultTagetLibItemReq> req = resultTagetLibService.selectResultTagetLibByModelReqId(dto.getId());
             itemReq.setTagetLibItems(req);
             modelItems.add(itemReq);