From 51065db2a119ddde88c7e1a7c4b37d9ef622921e Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期五, 06 九月 2024 11:53:03 +0800
Subject: [PATCH] 归档按钮权限控制
---
src/main/java/com/product/file/service/OnlineDocumentEditService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/file/service/OnlineDocumentEditService.java b/src/main/java/com/product/file/service/OnlineDocumentEditService.java
index 819baea..8f39bf7 100644
--- a/src/main/java/com/product/file/service/OnlineDocumentEditService.java
+++ b/src/main/java/com/product/file/service/OnlineDocumentEditService.java
@@ -75,7 +75,15 @@
}
List<File> fileList = new ArrayList<>(3);
if (!StringUtils.isEmpty(document_template)) {
- fileList.add(fileManagerService.getFile(document_template));
+ File file1 = fileManagerService.getFile(document_template);
+ //鍒ゆ柇file1鐨勬枃浠剁被鍨�
+ if (file1.getName().substring(file1.getName().lastIndexOf(".") + 1).equals("doc")) {
+ //杞崲涓篸ocx
+ File docx = com.product.file.util.FileUtil.toDocx(file1);
+ FileUtil.del(file1);
+ file1 = docx;
+ }
+ fileList.add(file1);
fileList.add(file);
} else {
fileList.add(file);
@@ -86,7 +94,7 @@
File mergeFile = MergeDoc.mergeDoc(fileList, Global.getSystemConfig("upload.file.temp.path", "./attachment/temp") +
File.separator + "nest_red_document_" + IdUtil.randomUUID() + "_" + ff.getString("file_uuid"));
if (mergeFile != null && mergeFile.isFile()) {
- if("doc".equals(fileType)){
+ if ("doc".equals(fileType)) {
//灏哾ocx鏂囦欢杞崲涓篸oc鏂囦欢
File f = mergeFile;
mergeFile = com.product.file.util.FileUtil.toDoc(f);
@@ -104,6 +112,7 @@
} catch (BaseException e) {
throw e;
} catch (Exception e) {
+ e.printStackTrace();
throw new BaseException(FileCode.NEST_RED_DOCUMENT_FAIL);
}
}
--
Gitblit v1.9.2