From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交

---
 server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 2615bbf..78951b8 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -40,6 +40,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -445,6 +446,7 @@
 
             List<File> fileList = new ArrayList<>();
             List<Multifile> multifileList = multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda()
+                    .eq(Multifile::getIsdeleted,Constants.ZERO)
                     .eq(Multifile::getObjId,id)
                     .isNotNull(Multifile::getFileurl)
                     .in(Multifile::getObjType, Arrays.asList(new Integer[]{
@@ -471,14 +473,14 @@
             if(fileList == null || fileList.size() == 0){
                 throw  new BusinessException(ResponseStatus.DATA_EMPTY);
             }
-            String fileName =  model.getInformantName() +"鐞嗚禂璧勬枡涓媉"+System.currentTimeMillis()+".zip" ;
-            String encodeFileName = URLEncoder.encode(fileName);
+            String fileName =  model.getInformantName() +"-鐞嗚禂璧勬枡-" +System.currentTimeMillis();
+            String encodeFileName =URLEncoder.encode(fileName, Charset.forName("UTF-8").toString())+".zip";
             response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
             response.setContentType("application/octet-stream");
             response.setHeader("eva-opera-type", "download");
             response.setHeader("eva-download-filename", encodeFileName);
             Constants.packFilesToZip(fileList,response.getOutputStream());
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
         }
     }

--
Gitblit v1.9.3