Merge branch 'master' of http://219.151.185.227:3000/zhuwei/bladex into lihb

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1326,6 +1326,7 @@ public R<Object> batchAbolish(@RequestParam String ids, String primaryKeyId, @Re
                 String update = "update u_entrust_info set status=3 where id in(" + String.join(",", idss) + ")";
                 jdbcTemplate.execute(update);
             }
+            return R.success("操作成功");
         } catch (Exception e) {
             e.printStackTrace();
             return R.data(300, false, "废除失败");

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

@@ -1407,13 +1407,14 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
         //String querySql = "select * from table_data_info where p_key_id=" + pkeyId;
         List<Map<String, Object>> dataIn = jdbcTemplate.queryForList(querySql);
-
+        String keyNameList="";
         // 匹配关联
         try {
             InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(wbsTreeContract.getHtmlUrl());
             String htmlString = IoUtil.readToString(inputStreamByUrl);
             Document doc = Jsoup.parse(htmlString);
             document = doc;
+            keyNameList= getKeyNameList(doc);
 
             // 解析
             // 模糊匹配
@@ -1677,9 +1678,18 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             this.formulaService.paramFormula(wbsTreeContract, reData, document);
         }
         /*获取参数库数据*/
-        Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, nodeId);
-        for (Map.Entry<String, Object> entry : nodeBaseInfo.entrySet()) {
-            reData.putIfAbsent(entry.getKey(), entry.getValue());
+//        Map<String, Object> nodeBaseInfo = nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId, nodeId);
+//        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();
+                }
+            }
         }
         return reData;
     }
@@ -3289,9 +3299,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                                 }
                                             }
                                         } else {
-                                            if(y1==23&&x1==9){
-                                                System.out.println("");
-                                            }
                                             Row row = sheet.getRow(y1-1);
                                             if (row != null) {
                                                 Cell cell = row.getCell(x1 - 1);