Explorar el Código

公式相关:评定

yangyj hace 1 año
padre
commit
d7c86071fb

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

@@ -117,7 +117,7 @@ public class FormulaMileage implements FormulaStrategy {
             }
 
         }
-
+        cur.setFinished(Boolean.TRUE);
     }
 
     public static final Pattern MILE_P = Pattern.compile("(?<=T\\(com.mixsmart.utils.CustomFunction\\).MILE\\()([^,]+),([^,]+)(?=,)");

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

@@ -1059,7 +1059,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     });
                 }
                 List<ElementBlock> finalElementBlockList = elementBlockList;
-                tec.checkItems.stream().filter(e -> !e.empty()).forEach(c -> {
+                tec.checkItems.forEach(c -> {
                     ElementBlock eb = elementBlockMap.get(c.getCode());
                     ItemBlock targetItem = itemBlockMap.get(c.getCode() + ":" + tec.getCurrentNode().getPkId());
                     List<Object> list = c.getValues().stream().map(ElementData::getValue).filter(StringUtils::isNotEmpty).collect(Collectors.toList());