Browse Source

底层节点

chenr 3 months ago
parent
commit
d3ddd9db86

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

@@ -1678,12 +1678,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             this.formulaService.paramFormula(wbsTreeContract, reData, document);
         }
         /*获取参数库数据*/
-//        Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, nodeId);
-//        if(nodeBaseInfo!=null){
-//            for (Map.Entry<String, Object> entry : nodeBaseInfo.entrySet()) {
-//                reData.putIfAbsent(entry.getKey(), entry.getValue());
-//            }
-//        }
+        Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, nodeId);
+        if(nodeBaseInfo!=null){
+            for (Map.Entry<String, Object> entry : nodeBaseInfo.entrySet()) {
+                reData.putIfAbsent(entry.getKey(), entry.getValue());
+            }
+        }
 //        if(reData.size()>0){
 //            //处理key重复导致pdf数据错位
 //            for (Iterator<Map.Entry<String, Object>> iterator = reData.entrySet().iterator(); iterator.hasNext(); ) {