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/DocumentService.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index b4032a7..526e10c 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -17,11 +17,12 @@
import com.product.file.config.CmnConst;
import com.product.file.service.ide.IDocumentService;
import com.product.module.sys.entity.SystemUser;
-import com.product.org.admin.service.OrganizationServiceV2;
import com.product.util.BaseUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -48,8 +49,6 @@
@Autowired
DocumentDirectoryService documentDirectoryService;
- @Autowired
- OrganizationServiceV2 organizationServiceV2;
@Override
@Transactional
@@ -225,9 +224,17 @@
baseDao.add(dataTableEntity);
}
- public boolean verifyOrgExist(String org, Integer user_id) {
+ public boolean verifyOrgExist(String org) {
+ Integer user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
+ String code = SpringMVCContextHolder.getCurrentUser().getCurrentStaff().getString("tricode");
+ //鑾峰彇鎵�鏈変笂绾х紪鐮�
+ String[] superior_code = new String[code.split("-").length - 1];
+ for (int i = 0; i < code.split("-").length - 1; i++) {
+ superior_code[i] = code.substring(0, code.length() - ((i + 1) * 4));
+ }
String this_user = String.valueOf(user_id);
- String[][] orgArr = organizationServiceV2.decomposesMultipleTypeValues(org);
+ SpringMVCContextHolder.getCurrentUser().getLanguageCode();
+ String[][] orgArr = BaseUtil.decomposesMultipleTypeValues(org);
String[] user = orgArr[3];
if (null != user) {
for (int i = 0; i < user.length; i++) {
@@ -238,14 +245,28 @@
}
String[] level = orgArr[0];
String[] dept = orgArr[1];
- String[] post = orgArr[2];
+ // List<String> list = Arrays.asList(a); --OK
+ // List<String> list = Arrays.asList("A","B","C"); --OK
+ // list.add("F"); --UnsupportedOperationException
+ // list.remove("A"); --UnsupportedOperationException
+ // list.set(1,"javaee");--OK (鍥犱负鏄妸鏁扮粍杞负闆嗗悎锛屽叾鏈川杩樻槸鏁扮粍锛屾暟缁勯暱搴﹀浐瀹氫笉鍙橈紝浣嗗唴瀹瑰彲浠ユ敼鍙�)
+ // 缁撹锛氳櫧鐒跺彲浠ユ妸鏁扮粍杞负闆嗗悎锛屼絾鏄泦鍚堥暱搴︿笉鑳芥敼鍙�
+ List list = new ArrayList();
+ ;
if (null != level) {
- DataTableEntity org_level_uuid = baseDao.listTable(CmnConst.PRODUCT_SYS_STAFFS, BaseUtil.buildQuestionMarkFilter("org_level_uuid", level, true) + " and user_id=?", new String[]{this_user});
- if (org_level_uuid.getRows() > 0) return true;
+ list.addAll(Arrays.asList(level));
}
if (null != dept) {
- DataTableEntity dept_uuid = baseDao.listTable(CmnConst.PRODUCT_SYS_STAFFS, BaseUtil.buildQuestionMarkFilter("dept_uuid", dept, true) + " and user_id=?", new String[]{this_user});
- if (dept_uuid.getRows() > 0) return true;
+ list.addAll(Arrays.asList(dept));
+ }
+ String[] level_dept = new String[list.size()];
+ list.toArray(level_dept);
+
+
+ String[] post = orgArr[2];
+ if (level_dept.length != 0) {
+ DataTableEntity org_level_uuid = baseDao.listTable(CmnConst.TABLE_PRODUCT_SYS_ORG_LEVELS, BaseUtil.buildQuestionMarkFilter("uuid", level_dept, true) + " and " + BaseUtil.buildQuestionMarkFilter("org_level_code", superior_code, true), new String[]{});
+ if (org_level_uuid.getRows() > 0) return true;
}
if (null != post) {
DataTableEntity post_uuid = baseDao.listTable(CmnConst.PRODUCT_SYS_STAFFS, BaseUtil.buildQuestionMarkFilter("job_post_uuid", post, true) + " and user_id=?", new String[]{this_user});
@@ -268,7 +289,7 @@
//String key = "%,140,%";
DataTableEntity dataTableEntity = new DataTableEntity();
FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.product_oa_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
- if (verifyOrgExist(org.getString("storage_uuid"), user_id)) {
+ if (verifyOrgExist(org.getString("storage_uuid"))) {
StringBuffer sql = new StringBuffer();
sql.append(" SELECT substring_index(substring_index(a.rigths,',',b.help_topic_id+1),',',-1) fun FROM product_oa_directory_rights a ")
.append(" INNER join mysql.help_topic b on b.help_topic_id < (length(a.rigths) - length(replace(a.rigths,',',''))+1) ")
--
Gitblit v1.9.2