节点基础数据优化

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

@@ -1938,7 +1938,11 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         /*获取参数库数据*/
         Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, nodeId);
         if(nodeBaseInfo!=null){
-            reData.putAll(nodeBaseInfo);
+            for (Map.Entry<String, Object> entry : nodeBaseInfo.entrySet()) {
+                if (reData.get(entry.getKey()) == null || reData.get(entry.getKey()).toString().isEmpty()) {
+                    reData.put(entry.getKey(), entry.getValue());
+                }
+            }
         }
 //        if(reData.size()>0){
 //            //处理key重复导致pdf数据错位