|
@@ -1476,8 +1476,9 @@ public R<String> batchDownloadFileToZip(String ids, HttpServletResponse response
|
|
|
String fileName = result.get(i).getName();
|
|
|
fileName = fileName == null ? "找不到文件题目" : fileName.replaceAll("\\\\", "_").replaceAll("/", "_");
|
|
|
if (nameMap.containsKey(fileName)) {
|
|
|
- fileName = fileName + "_" + nameMap.get(fileName);
|
|
|
- nameMap.put(fileName, nameMap.get(fileName) + 1);
|
|
|
+ int num = nameMap.get(fileName) == null ? 1 : nameMap.get(fileName);
|
|
|
+ nameMap.put(fileName, num + 1);
|
|
|
+ fileName = fileName + "_" + num;
|
|
|
} else {
|
|
|
nameMap.put(fileName, 1);
|
|
|
}
|