From 046a97925c84b5f8c8c16349a57638722fead578 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 15 八月 2023 19:06:13 +0800
Subject: [PATCH] 设备管理优化
---
igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml | 6 ++++--
igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
index d005b9c..9c815cb 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -269,7 +269,8 @@
<Property name="iconClass">fa fa-search</Property>
</Button>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsParam").flushAsync();</ClientEvent>
+ <ClientEvent name="onClick">view.get("#dsParam").flushAsync();
+view.get("#dsParam").insert({});</ClientEvent>
<Property name="caption">閲嶇疆</Property>
<Property name="iconClass">fa fa-refresh</Property>
<Property name="exClassName">btn-default</Property>
@@ -527,7 +528,8 @@
<Property name="iconClass">fa fa-search</Property>
</Button>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsParamCheck").flushAsync();</ClientEvent>
+ <ClientEvent name="onClick">view.get("#dsParamCheck").flushAsync();
+view.get("#dsParamCheck").insert({});</ClientEvent>
<Property name="caption">閲嶇疆</Property>
<Property name="iconClass">fa fa-refresh</Property>
<Property name="exClassName">btn-default</Property>
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