公式相关

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -1527,7 +1527,7 @@ public class CustomFunction {
 	public static Object tree(List<String>treeNodes,String param){
 		if(CollectionUtil.isNotEmpty(treeNodes)&& Func.isNotBlank(param)){
 			List<String>nodes=new ArrayList<>(treeNodes);
-			Collections.reverse(nodes);
+			//Collections.reverse(nodes);
 			List<String> result = new ArrayList<>();
 			param=param.replaceAll("(?i:c)","");
 			List<String> list = Arrays.asList(param.split("[^.\\d]"));

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsParamController.java

@@ -371,8 +371,9 @@ public class WbsParamController {
                             tmpMap.clear();
                         }
                         Formula finalFormula = formula;
+                        String name=e.getName().replace("【水】","").trim();
                         finalElementMap.forEach(m->{
-                            if(m.get("name").toString().contains(e.getName())){
+                            if(m.get("name").toString().contains(name)){
                                 /*匹配名称，且该元素没有绑定任何节点参数公式*/
                                 if(longList.stream().noneMatch(k->StringUtils.isEquals(k,m.get("id")))){
                                     ElementFormulaMapping efm = new ElementFormulaMapping();

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

@@ -39,7 +39,7 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             StaticLog.info("获取节点{}文件题名",nodeId);
             List<WbsTreeContract> nodes = chain(contractId,nodeId,wbsTreeContract.getPKeyId(),wbsTreeContract);
             if(Func.isNotEmpty(nodes)){
-                /**优先取私有*/
+                /*优先取私有*/
                 WbsParam wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getNodeId,wbsTreeContract.getPKeyId()).eq(WbsParam::getK,FILE_TITLE));
                 if(wp==null){
                      wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getNodeId,nodeId).eq(WbsParam::getK,FILE_TITLE));
@@ -71,11 +71,14 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             if(pkId!=null&&wbsTreeContract==null) {
                 wbsTreeContract = treeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, pkId));
             }
+            /*去头尾*/
             nodes.remove(nodes.size() - 1);
+            nodes.remove(0);
+            assert wbsTreeContract != null;
             if(Func.isNotBlank(wbsTreeContract.getFullName())) {
                 wbsTreeContract.setNodeName(wbsTreeContract.getFullName());
             }
-            nodes.set(0, wbsTreeContract);
+            nodes.add(wbsTreeContract);
         }
         return nodes;
     }