From c26c4778ffaa583db2d56d82c3c861e724d0000c Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:32:36 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ，合并空调中的报表、数据源模块
---
src/main/java/com/product/file/service/DocumentDirectoryService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentDirectoryService.java b/src/main/java/com/product/file/service/DocumentDirectoryService.java
index d050220..e9eacf2 100644
--- a/src/main/java/com/product/file/service/DocumentDirectoryService.java
+++ b/src/main/java/com/product/file/service/DocumentDirectoryService.java
@@ -171,13 +171,22 @@
//鍏徃鏂囦欢澶�
DataTableEntity data;
SystemUser user = SpringMVCContextHolder.getCurrentUser();
+ StringBuffer sql = new StringBuffer();
+ sql.append("SELECT a.*,ifnull(b.number,0) number FROM product_oa_directory a LEFT JOIN ");
+ sql.append("(SELECT COUNT(*) number,directory_uuid FROM product_oa_document GROUP BY directory_uuid) b on a.uuid=b.directory_uuid ");
+
if("1".equals(directory_type)){
String org_level_uuid = user.getOrg_level_uuid();
- data = baseDao.listTable(CmnConst.product_oa_DIRECTORY, " directory_type = 1 AND org_level_uuid = ?", new String[]{org_level_uuid}, "tricode");
+ sql.append("where directory_type = 1 AND org_level_uuid = ? ");
+ data = baseDao.listTable(sql.toString(), new Object[]{org_level_uuid});
+// data = baseDao.listTable(CmnConst.product_oa_DIRECTORY, " directory_type = 1 AND org_level_uuid = ?", new String[]{org_level_uuid}, "tricode");
//涓汉鏂囦欢澶�
}else {
Integer userId = user.getUser_id();
- data = baseDao.listTable(CmnConst.product_oa_DIRECTORY, " directory_type = 2 AND created_by = ?", new Object[]{userId}, "tricode");
+ sql.append("where directory_type = 2 AND created_by = ? ");
+ data = baseDao.listTable(sql.toString(), new Object[]{userId});
+
+// data = baseDao.listTable(CmnConst.product_oa_DIRECTORY, " directory_type = 2 AND created_by = ?", new Object[]{userId}, "tricode");
}
baseDao.listInternationDataTable(data, null);
JSONArray menus = this.encapsulationTree(data);
--
Gitblit v1.9.2