From 91cd2a3d3d162990ad8080fed7ec5394a05366ba Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 27 八月 2024 16:29:04 +0800
Subject: [PATCH] bug
---
src/main/java/com/product/file/service/DocumentService.java | 4 ++--
src/main/java/com/product/file/controller/DocumentDirectoryController.java | 21 +++++++++++----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentDirectoryController.java b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
index 32ed83a..cfcb179 100644
--- a/src/main/java/com/product/file/controller/DocumentDirectoryController.java
+++ b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
@@ -36,7 +36,7 @@
@RequestMapping("/api/directory")
@RestController
public class DocumentDirectoryController extends AbstractBaseController {
-
+
@Autowired
DocumentDirectoryService documentDirectoryService;
@@ -45,10 +45,10 @@
*/
@Autowired
PermissionService permissionService;
-
+
/**
* 鏂板鏂囦欢澶规暟鎹�
- *
+ *
* @param request
* @return
*/
@@ -72,7 +72,7 @@
/**
* 鏂板鏂囦欢澶规暟鎹�
- *
+ *
* @param request
* @return
*/
@@ -97,6 +97,7 @@
IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
return OK_Add(service.addDocumentDirectory(fse));
} catch (BaseException e) {
+ e.printStackTrace();
SpringMVCContextHolder.getSystemLogger().error(e);
return this.error(e);
} catch (Exception e) {
@@ -109,7 +110,7 @@
/**
* 淇敼鏂囦欢澶�
- *
+ *
* @param request
* @return
*/
@@ -166,7 +167,7 @@
/**
* 涓汉鏂囦欢澶归噸鍛藉悕
- *
+ *
* @param request
* @return
*/
@@ -223,7 +224,7 @@
/**
* 鍒犻櫎鏂囦欢澶�
- *
+ *
* @param request
* @return
*/
@@ -280,7 +281,7 @@
/**
* 鏂囦欢鐩綍鍒楄〃灞曠ず
- *
+ *
* @param request
* @return
*/
@@ -316,7 +317,7 @@
/**
* 鑾峰彇鏂囨。鐩綍鏍戝舰鍒楄〃
- *
+ *
* @param request
* @return
*/
@@ -352,7 +353,7 @@
/**
* 鑾峰彇鏂囨。鐩綍璇︽儏
- *
+ *
* @param request
* @return
*/
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index d10298b..fa8ad64 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -383,12 +383,12 @@
sql.append(" and tricode_parent = ? ");
//鍔犺浇鏂囦欢璺緞
DataTableEntity dataTableEntity = documentDirectoryService.getDirectoryStructure(fse);
- object.put("PRODUCT_OA_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));
+ object.put("product_oa_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));
}
//sql.append(" GROUP BY tricode,tricode_parent,directory_name");
DataTableEntity data = baseDao.listTable(sql.toString(), param.toArray());
- object.put("PRODUCT_OA_directory_sub", BaseUtil.dataTableEntityToJson(data));
+ object.put("product_oa_directory_sub", BaseUtil.dataTableEntityToJson(data));
baseDao.listInternationDataTable(data, null);
return object;
--
Gitblit v1.9.2