yangyj 2 gadi atpakaļ
vecāks
revīzija
e8f43c6563

+ 7 - 1
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/FormData.java

@@ -11,6 +11,7 @@ import org.springblade.manager.entity.Formula;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -109,10 +110,15 @@ public class FormData {
         }
     }
 
+    /**是否还需要执行公式*/
     public Boolean verify(){
         return !this.finished;
     }
-
+    /**是否存可执行公式*/
+    public Boolean executable(){
+        return !Objects.isNull(this.getFormula());
+    }
+   /**元素内容是否为空*/
     public Boolean empty(){
       return  Func.isEmpty(this.values);
     }

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

@@ -29,6 +29,6 @@ public interface IFormulaService extends BaseService<Formula> {
     /**
      * 公式运算*/
     IFormulaService calculate();
-    /*格式化*/
+    /**格式化*/
     void format();
 }

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

@@ -129,7 +129,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         if(CollectionUtil.isNotEmpty(this.env.formDataList)){
             for(FormData fd:this.env.formDataList){
                 /*预处理公式脚本*/
-                if(!fd.verify()){
+                if(!fd.executable()){
                     /*不存公式,则认为执行完成,不会再主动执行*/
                     fd.setFinished(Boolean.TRUE);
                     continue;

+ 2 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsParamServiceImpl.java

@@ -43,6 +43,8 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             StaticLog.info("获取节点{}文件题名",nodeId);
             List<WbsTreeContract> nodes = treeContractService.searchParentAllNode(nodeId,contractId);
             if(Func.isNotEmpty(nodes)){
+                /*移除根节点*/
+                nodes.remove(nodes.size()-1);
                 wbsTreeContract.setNodeName(wbsTreeContract.getFullName());
                 nodes.set(0,wbsTreeContract);
                 WbsParam wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getWbsId,nodeId).eq(WbsParam::getK,FILE_TITLE));