From db376dbba9af1ce92d4f8e697a2fe90d7c79d566 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期五, 23 八月 2024 16:15:04 +0800
Subject: [PATCH] 文档借阅功能8.23

---
 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 3d72614..f5aa082 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -473,9 +473,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;
     }
@@ -564,4 +570,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