yangyj 1 year ago
parent
commit
bced158c28

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

@@ -81,7 +81,10 @@ public class SubTable {
                 }
                 if (design != null) {
                     if (nameAndDesign.length >= 2) {
-                        designList.addAll(Collections.nCopies(count, nameAndDesign[1]));
+                        designList.add( nameAndDesign[1]);
+                        if(count>1){
+                            designList.addAll(Collections.nCopies(count-1, nameAndDesign[1]));
+                        }
                     } else {
                         designList.addAll(Collections.nCopies(count, ""));
                     }

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1500,7 +1500,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     @Override
     public List<Formula> getFormulaList(List<KeyMapper> keyMapperList) {
         if(Func.isNotEmpty(keyMapperList)){
-            List<Formula> result = this.listByIds(keyMapperList.stream().map(KeyMapper::getFormulaId).collect(Collectors.toList()));
+            List<Formula> result = this.listByIds(keyMapperList.stream().map(KeyMapper::getFormulaId).distinct().collect(Collectors.toList()));
             if(Func.isNotEmpty(result)){
                 return result;
             }