附表同名项目只显示一个

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/FormulaTurnPoint.java

@@ -6,6 +6,7 @@ import com.mixsmart.utils.CustomFunction;
 import com.mixsmart.utils.FormulaUtils;
 import com.mixsmart.utils.StringUtils;
 import lombok.Data;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.dto.ElementData;
@@ -83,7 +84,7 @@ public class FormulaTurnPoint implements FormulaStrategy {
                 info.setMin(0.4D);
             }
            /* 分组计算*/
-            List<List<TurnPoint>> result = total.stream().map(e->ITurnPointCalculator.create(e, configMap,info)).collect(Collectors.toList());
+            List<List<TurnPoint>> result = total.stream().map(e->ITurnPointCalculator.create(e, configMap, BeanUtil.copyProperties(info,LevelInfo.class))).collect(Collectors.toList());
             /*附加属性如：顶面和底面高程判断*/
             forG8(cur,result, (Map<String, Object>)tec.getConstantMap().computeIfAbsent("G8", k -> new HashMap<>()),tec);
            /*插值分页*/

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/SubTable.java

@@ -3,6 +3,7 @@ package org.springblade.manager.formula.impl;
 import com.mixsmart.utils.FormulaUtils;
 import com.mixsmart.utils.StringUtils;
 import lombok.Data;
+import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
 
@@ -74,7 +75,10 @@ public class SubTable {
                 /*写人的行数*/
                 int count = (int) Math.ceil((double) values.size() / (double) ROW_SIZE);
 //                   int count2=count/STEP[0];
-                itemNameList.addAll(Collections.nCopies(count, nameAndDesign[0]));
+                itemNameList.add(nameAndDesign[0]);
+                if(count>1) {
+                    itemNameList.addAll(Collections.nCopies(count-1, StringPool.EMPTY));
+                }
                 if (design != null) {
                     if (nameAndDesign.length >= 2) {
                         designList.addAll(Collections.nCopies(count, nameAndDesign[1]));