From a673b25a0bc23b3b8b914088bdb7dca3d2e89d45 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:18:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java
index ecc352d..477ecce 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java
@@ -327,7 +327,7 @@
this.pagingQuery(page, hql, count, args);
}
- public void saveArchives(OAArchives data) {
+ public String saveArchives(OAArchives data) {
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -347,6 +347,7 @@
session.flush();
session.close();
}
+ return data.getId();
}
public String delArchives(OAArchives data) {
--
Gitblit v1.9.3