@@ -1939,11 +1939,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
/*获取参数库数据*/
Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, nodeId);
if(nodeBaseInfo!=null){
- 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());
- }
+ reData.putAll(nodeBaseInfo);
}
// if(reData.size()>0){
// //处理key重复导致pdf数据错位