优化公式说明源节点获取以及解决部分错误公式执行报错的问题

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

@@ -1200,7 +1200,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             map.put(pKeyId, nodeName);
             RandomNumberHolder.setRandomNumber(map);
         } catch (NumberFormatException e) {
-            throw new RuntimeException(e);
+            e.printStackTrace();
         }
 
         List<NodeTable> tableAll = createNodeTables(wbsTreeTable.getPId(), tableInfoList.get(0).getContractId(), tableInfoList.get(0).getProjectId(), ExecuteType.INSPECTION, tableInfoList.get(0).getClassify(), null);
@@ -1306,7 +1306,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     tableGroup.forEach((tableName, contracts) -> {
                         WbsTreeContract temp = null;
                         for (WbsTreeContract contract : contracts) {
-                            if (Objects.equals(contract.getPKeyId(), wbsTreeTable.getPId())) {
+                            if (Objects.equals(contract.getPKeyId(), wbsTreeTable.getPKeyId())) {
                                 temp = contract;
                                 break;
                             }
@@ -1378,7 +1378,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 if (dataMap != null && keys != null) {
                     for (String key : keys) {
                         String value = dataMap.get(key);
-                        if (value != null) {
+                        if (StringUtil.hasText(value)) {
                             data.append(value).append(",");
                         }
                     }

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

@@ -6651,7 +6651,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             }
 
         }
-        return null;
+        return new HashMap<>();
     }
 
     @Override