From e1b48a354bb0a430a1f913f1b8de03d69c9514e9 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期一, 03 十一月 2025 11:56:43 +0800
Subject: [PATCH] 已送审保养打印-打印模板处理为保存到数据库

---
 src/main/java/com/product/file/service/FileManagerService.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/product/file/service/FileManagerService.java b/src/main/java/com/product/file/service/FileManagerService.java
index db4ae7e..373343b 100644
--- a/src/main/java/com/product/file/service/FileManagerService.java
+++ b/src/main/java/com/product/file/service/FileManagerService.java
@@ -1024,13 +1024,22 @@
 					ftpService.downloadFile(path, os);
 				}
 			} else {
-				// 鐩存帴鍦ㄦ湰鍦扮殑鐩綍涓壘鏂囦欢
-				String localBasePath = Global.getSystemConfig("local.dir", "");
-				path = localBasePath + File.separator + path;
-				File file = new File(path);
-				int len;
-				byte[] b = new byte[1024];
-				try (InputStream is = new FileInputStream(file)) {
+                InputStream is = null;
+                try {
+                    Object fileContent = attachmentFse.getValue("file_content");
+                    boolean saveInDb = fileContent != null;
+                    if (saveInDb) {
+                        // 瀛樺偍鍒版暟鎹簱
+                        is = (InputStream) fileContent;
+                    } else {
+                        // 鐩存帴鍦ㄦ湰鍦扮殑鐩綍涓壘鏂囦欢
+                        String localBasePath = Global.getSystemConfig("local.dir", "");
+                        path = localBasePath + File.separator + path;
+                        File file = new File(path);
+                        is = Files.newInputStream(file.toPath());
+                    }
+                    int len;
+                    byte[] b = new byte[1024];
 					while ((len = is.read(b)) > 0) {
 						if (Global.getPropertyToBoolean("file.encrypt", "true")) {
 							// 闇�瑕佽В瀵�
@@ -1040,7 +1049,13 @@
 							os.write(b, 0, len);
 						}
 					}
-				}
+				} catch (Exception e) {
+                    throw new BaseException(FileCode.GET_FILE_BYTES_FAIL);
+                } finally {
+                    if (is != null) {
+                        is.close();
+                    }
+                }
 			}
 
 			return os.toByteArray();

--
Gitblit v1.9.2