Merge branch 'fix/一键下载文档中有重名文件处理' into 'wrdp'

[流程平台]处理一键下载文档中有重名附件导致附件丢失的问题

See merge request o2oa/o2oa!2467

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/Business.java

@@ -1212,7 +1212,7 @@ public class Business {
 
 	/**
 	 * 下载附件并打包为zip
-	 * 
+	 *
 	 * @param attachmentList
 	 * @param os
 	 * @throws Exception
@@ -1224,7 +1224,11 @@ public class Business {
 		/* 生成zip压缩文件内的目录结构 */
 		if (attachmentList != null) {
 			for (Attachment att : attachmentList) {
-				filePathMap.put(att.getName(), att);
+				if(filePathMap.containsKey(att.getName())) {
+					filePathMap.put(att.getName()+"-"+att.getSite(), att);
+				}else{
+					filePathMap.put(att.getName(), att);
+				}
 			}
 		}
 		try (ZipOutputStream zos = new ZipOutputStream(os)) {
@@ -1258,4 +1262,4 @@ public class Business {
 		}
 	}
 
-}
+}