From 1c2322f1b9e65798580d5fea84f115a3e4924e7f Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 5 Nov 2020 16:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9maxCount?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/ResultRecordController.java   | 6 ++++++
 1 file changed, 6 insertions(+)

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 cf35373d..e4bd1a33 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -414,6 +414,9 @@ public class ResultRecordController extends AbstractController {
             if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的
                 resultRecortModelDto.setWeight(null);
             }
+            if(resultRecortModelDto.getMaxCount().intValue() == 10000){//不限制数量
+                resultRecortModelDto.setMaxCount(null);
+            }
             List<ResultDetailDto> detailDtos =
                     resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType());
             for (ResultDetailDto dto:detailDtos
@@ -577,6 +580,9 @@ public class ResultRecordController extends AbstractController {
              ) {
             int index = 0;
             BigDecimal weight = BigDecimal.ZERO;
+            if(model.getDetailDtos().size() > model.getMaxCount().intValue()){
+                return R.error(model.getName() + "维度指标不能超过" + model.getMaxCount());
+            }
             for (ResultDetailDto detailDto:model.getDetailDtos()
                  ) {//排序
                 ResultDetail resultDetail = new ResultDetail();