From d62cbd8da3bd2422de2923a6e7d999822730d632 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 16 九月 2023 11:55:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
index a9e7d86..a5cf7bd 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
@@ -210,10 +210,12 @@
@Expose
public String delArchives(OAArchives data) throws Exception {
List<FileInfo> list = data.getFileData();
- if (list.isEmpty()) {
+ if (!list.isEmpty()) {
String fileId = list.get(0).getFileId();
Date createTime = list.get(0).getCreateTime();
- if (null == createTime) createTime = new Date();
+ if (null == createTime) {
+ createTime = new Date();
+ }
File file = new File(fileService.getCommonFilePath(createTime), fileId);
--
Gitblit v1.9.3