Merge remote-tracking branch 'origin/test-merge' into test-merge

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

@@ -1445,6 +1445,7 @@ public R<String> batchDownloadFileToZip(String ids, HttpServletResponse response
                  /*   result.forEach(query -> urls.add(
                             StringUtils.isNotEmpty(query.getNodePdfUrl()) ? query.getNodePdfUrl() + "@@@" + query.getName() + "-" + query.getId() : query.getPdfUrl() + "@@@" + query.getName() + "-" + query.getId()));
                    */
+                Map<String, Integer> nameMap = new HashMap<>();
                 for (int i=0;i<result.size();i++) {
                     String url_link = "";
                     List<TaskApprovalVO.ApprovalFile> files = jdbcTemplate.query("select name as fileName,domain_url as fileUrl from m_table_file where is_deleted = 0 and type in(10,11,12)and tab_id = ?", new BeanPropertyRowMapper<>(TaskApprovalVO.ApprovalFile.class), result.get(i).getWbsId());
@@ -1473,7 +1474,13 @@ public R<String> batchDownloadFileToZip(String ids, HttpServletResponse response
                         url_link = url.get(0);
                     }
                     String fileName = result.get(i).getName();
-                    fileName = fileName == null ? "" : fileName.replaceAll("\\\\", "_").replaceAll("/", "_");
+                    fileName = fileName == null ? "找不到文件题目" : fileName.replaceAll("\\\\", "_").replaceAll("/", "_");
+                    if (nameMap.containsKey(fileName)) {
+                        fileName = fileName + "_" + nameMap.get(fileName);
+                        nameMap.put(fileName, nameMap.get(fileName) + 1);
+                    } else {
+                        nameMap.put(fileName, 1);
+                    }
                     urls.add(url_link + "@@@" + fileName);
                 }