隐藏参数库

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

@@ -1414,7 +1414,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             String htmlString = IoUtil.readToString(inputStreamByUrl);
             Document doc = Jsoup.parse(htmlString);
             document = doc;
-            keyNameList= getKeyNameList(doc);
+            //keyNameList= getKeyNameList(doc);
 
             // 解析
             // 模糊匹配
@@ -1679,18 +1679,20 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         }
         /*获取参数库数据*/
 //        Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, nodeId);
-//        for (Map.Entry<String, Object> entry : nodeBaseInfo.entrySet()) {
-//            reData.putIfAbsent(entry.getKey(), entry.getValue());
+//        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(); ) {
+//                Map.Entry<String, Object> entry = iterator.next();
+//                if (!keyNameList.equals("") && keyNameList.indexOf(entry.getKey()) <= 0) {
+//                    iterator.remove();
+//                }
+//            }
 //        }
-        if(reData.size()>0){
-            //处理key重复导致pdf数据错位
-            for (Iterator<Map.Entry<String, Object>> iterator = reData.entrySet().iterator(); iterator.hasNext(); ) {
-                Map.Entry<String, Object> entry = iterator.next();
-                if (!keyNameList.equals("") && keyNameList.indexOf(entry.getKey()) <= 0) {
-                    iterator.remove();
-                }
-            }
-        }
         return reData;
     }