From 9a6140574003ec25e95e0248785843c3598168c4 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 23 八月 2024 16:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0
---
src/main/java/com/product/file/service/DocumentService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 284ed77..8effcfd 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -504,9 +504,15 @@
@Override
public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException {
- String document_name = fse.getString("document_name");
- String filter="file_name like '%"+document_name+"'%";
- DataTableEntity product_oa_document = baseDao.listTable("product_oa_document",filter);
+ DataTableEntity product_oa_document;
+ if(ObjectUtil.isNotEmpty(fse.getString("document_name"))){
+ String document_name = fse.getString("document_name");
+ String filter="file_name like '%"+document_name+"'%";
+ product_oa_document = baseDao.listTable("product_oa_document",filter);
+ }else {
+ product_oa_document = baseDao.listTable("product_oa_document");
+ }
+
return product_oa_document;
}
@@ -595,4 +601,11 @@
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString());
return dataTableEntity;
}
+
+ @Override
+ public FieldSetEntity getApplayInfo(FieldSetEntity fes) throws BaseException {
+ String uuid = fes.getString("uuid");
+ FieldSetEntity product_oa_document_borrow = baseDao.getFieldSetEntity("product_oa_document_borrow", uuid, false);
+ return product_oa_document_borrow;
+ }
}
--
Gitblit v1.9.2