Merge branch 'dev' of https://gitea.yeyaguitu.cn/ecology/ebu_ecology_dev1 into dev

hebin 保时捷文件名下载乱码，mapper更新null会变为空字符串处理

src/main/java/aiyh/utils/action/SafeCusBaseAction.java

@@ -200,6 +200,7 @@ public abstract class SafeCusBaseAction implements Action {
 		String billTable = requestManager.getBillTableName();
 		String id = mapper.selectIdByRequest(billTable, requestInfo.getRequestid());
 		result.put("id", id);
+		result.put("requestid", requestInfo.getRequestid());
 		return result;
 	}
 	

src/main/java/com/api/youhong/ai/pcn/download/service/DownloadFileService.java

@@ -11,7 +11,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.net.URLEncoder;
 
 /**
  * <h1></h1>
@@ -57,6 +59,11 @@ public class DownloadFileService {
 			}
 		};
 		String imageFileName = docImageInfo.getImageFileName();
+		try {
+			imageFileName = URLEncoder.encode(imageFileName, "UTF-8");
+		} catch (UnsupportedEncodingException ignore) {
+		}
+		
 		return Response
 				       .ok(stream)
 				       .header("Content-Disposition", "attachment; filename=\"" + imageFileName + "\"")

src/main/java/weaver/youhong/ai/haripijiu/action/sapdocking/VoucherPayableNewAction.java

@@ -172,7 +172,7 @@ public class VoucherPayableNewAction extends SafeCusBaseAction {
 		}
 		headKeys = sortKey(headKeys);
 		for (String headKey : headKeys) {
-			sb.append(Util.null2String(heads.get(headKey)).replace(" ", " ")).append("\t");
+			sb.append(Util.null2String(heads.get(headKey)).replace("<br>", " ").replace("&nbsp;", " ")).append("\t");
 		}
 		sb.deleteCharAt(sb.lastIndexOf("\t"));
 		sb.append("\r\n");
@@ -184,7 +184,7 @@ public class VoucherPayableNewAction extends SafeCusBaseAction {
 		try {
 			OutputStreamWriter out = new OutputStreamWriter(
 					Files.newOutputStream(Paths.get(filePath)), StandardCharsets.UTF_8);
-			out.write(sb.toString().replace("&nbsp;", " "));
+			out.write(sb.toString().replace("<br>", " ").replace("&nbsp;", " "));
 			out.close();
 			
 		} catch (IOException e) {