From 0b57c36ace11b95ce296820a927615a8561d20ae Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期六, 14 九月 2024 19:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev
---
src/main/java/com/product/file/config/DocumentCode.java | 1
src/main/java/com/product/file/service/DocumentDirectoryService.java | 260 ++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/product/file/config/CmnConst.java | 5
src/main/java/com/product/file/service/DocumentService.java | 27 +++
src/main/java/com/product/file/controller/DocumentDirectoryController.java | 28 ++++
src/main/java/com/product/file/service/ide/IDocumentDirectoryService.java | 5
pom.xml | 4
7 files changed, 319 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index a6b8f24..c34e64c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,10 @@
<artifactId>aspose-words</artifactId>
<version>21.11.1</version>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-quartz</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/com/product/file/config/CmnConst.java b/src/main/java/com/product/file/config/CmnConst.java
index 6794462..fc04f96 100644
--- a/src/main/java/com/product/file/config/CmnConst.java
+++ b/src/main/java/com/product/file/config/CmnConst.java
@@ -53,6 +53,11 @@
public static final String ATTACHMENT_URL = "attachment_url";
public static final String ENCRPT_SIGN = "encrypt_sign";
public static final String ATTACHMENT_TYPE_UUID = "attachment_type_uuid";
+ public static final String PRODUCT_SYS_FUNCTIONS = "product_sys_functions";
+ public static final String PRODUCT_SYS_DATAMODEL_FIELD = "product_sys_datamodel_field";
+ public static final String PRODUCT_SYS_DATAMODEL_TABLE = "product_sys_datamodel_table";
+ public static final String PRODUCT_AO_FILING_CONFIG = "product_oa_filing_config";
+
public static final String OPT_FLAT = "opt_flat";
public static final String UPLOAD_SIGN = "upload_sign";
diff --git a/src/main/java/com/product/file/config/DocumentCode.java b/src/main/java/com/product/file/config/DocumentCode.java
index dd20929..6077e36 100644
--- a/src/main/java/com/product/file/config/DocumentCode.java
+++ b/src/main/java/com/product/file/config/DocumentCode.java
@@ -41,6 +41,7 @@
// 璇ユ枃浠舵湭杩涜鎺堟潈锛屽闇�鏌ョ湅璇峰�熼槄
DOCUMENT_NO_AUTHORIZATION("璇ユ枃浠舵湭杩涜鎺堟潈锛屽闇�鏌ョ湅璇峰�熼槄", ModuleEnum.FILE.getValue() + "017"),
+ CRATED_TIMED_TASK_FAIL("鍒涘缓鏁版嵁鍚屾瀹氭椂浠诲姟澶辫触", ModuleEnum.FILE.getValue() + "018"),
;
diff --git a/src/main/java/com/product/file/controller/DocumentDirectoryController.java b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
index f6c645a..41573e4 100644
--- a/src/main/java/com/product/file/controller/DocumentDirectoryController.java
+++ b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
@@ -336,4 +336,32 @@
DocumentCode.DOCUMENT_CATALOG_GET_FAIL.getText());
}
}
+
+ /**
+ * 淇濆瓨鏂囨。褰掓。閰嶇疆
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/save-file-config/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String saveFileConfig(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
+ if(service.saveFileConfig(fse)) {
+ return OK();
+ }
+ return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
+ DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
+ } catch (BaseException e) {
+ e.printStackTrace();
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
+ DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
+ }
+ }
}
diff --git a/src/main/java/com/product/file/service/DocumentDirectoryService.java b/src/main/java/com/product/file/service/DocumentDirectoryService.java
index 1783b09..09e10da 100644
--- a/src/main/java/com/product/file/service/DocumentDirectoryService.java
+++ b/src/main/java/com/product/file/service/DocumentDirectoryService.java
@@ -17,11 +17,14 @@
import com.product.file.config.DocumentCode;
import com.product.file.service.ide.IDocumentDirectoryService;
import com.product.module.sys.entity.SystemUser;
+import com.product.quartz.service.impl.SysJobService;
import com.product.util.BaseUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -40,7 +43,8 @@
public BaseDao baseDao;
@Autowired
public DocumentDirectoryService documentDirectoryService;
-
+ @Autowired
+ SysJobService sysJobService;
/**
* 鍗曚綅鏂囦欢澶规爲
*
@@ -76,6 +80,7 @@
if (!originParent.equals(tricodeParent)) {
String originTricode = BaseUtil.strIsNull(fseOrigin.getString(CmnConst.TRICODE)) ? "" : fseOrigin.getString(CmnConst.TRICODE);
tricode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE, tricodeParent);
+ // 鍒锋柊code
StringBuilder sql = new StringBuilder();
sql.append("update product_oa_directory ");
sql.append("set tricode=concat(replace(substring(tricode,1,locate(?,tricode)+length(?)),?,?),substring(tricode,locate(?,tricode)+length(?)+1)), ");
@@ -83,14 +88,257 @@
sql.append("where tricode like ? ");
baseDao.executeUpdate(sql.toString(), new Object[]{originTricode, originTricode, originTricode, tricode, originTricode, originTricode,
originTricode, originTricode, originTricode, tricode, originTricode, originTricode, originTricode + "-%"});
- } else {
+ // 鍒锋柊灞傜骇
+ StringBuilder sb = new StringBuilder();
+ sb.append("UPDATE product_oa_directory \n");
+ sb.append("SET directory_tier = ( \n");
+ sb.append(" (LENGTH(tricode) - LENGTH(REPLACE(tricode, '-', '')) + 1) \n");
+ sb.append(") \n");
+ sb.append("WHERE tricode LIKE ? \n");
+ baseDao.executeUpdate(sb.toString(), new Object[] {tricode + "%"});
+ }else {
tricode = fseOrigin.getString(CmnConst.TRICODE);
}
}
fse.setValue(CmnConst.TRICODE, tricode);
- fse.setValue(CmnConst.DIRECTORY_TIER, tricode.split(",").length);
+ fse.setValue(CmnConst.DIRECTORY_TIER, tricode.split("-").length);
return baseDao.saveFieldSetEntity(fse);
}
+ @Transactional
+ @Override
+ public boolean saveFileConfig(FieldSetEntity fse) {
+ //鑾峰彇鍔熻兘琛ㄥ悕
+ FieldSetEntity functionUuid = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_FUNCTIONS, fse.getString("function_uuid"), false);
+
+ DataTableEntity field = baseDao.listTable(CmnConst.PRODUCT_SYS_DATAMODEL_FIELD, "table_uuid=? and field_name=?", new String[]{functionUuid.getString("table_uuid"), "archive_flag"});
+ if (field.getRows()==0){
+ FieldSetEntity fs = new FieldSetEntity();
+ fs.setTableName(CmnConst.PRODUCT_SYS_DATAMODEL_FIELD);
+ fs.setValue("table_uuid",functionUuid.getString("table_uuid"));
+ fs.setValue("field_name","archive_flag");
+ fs.setValue("field_type","int");
+ fs.setValue("field_show_name","褰掓。鏍囪瘑");
+ fs.setValue("field_description","褰掓。鏍囪瘑");
+ fs.setValue("field_length",10);
+ fs.setValue("field_unit",0);
+ fs.setValue("is_required",0);
+ fs.setValue("is_unique",0);
+ fs.setValue("is_filter",0);
+ fs.setValue("field_sequence",0);
+ fs.setValue("created_by",SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fs.setValue("created_utc_datetime",new Date());
+ baseDao.saveFieldSetEntity(fs);
+ FieldSetEntity table = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_DATAMODEL_TABLE, functionUuid.getString("table_uuid"), false);
+ baseDao.executeUpdate("ALTER TABLE "+table.getString("table_name")+" ADD COLUMN archive_flag INT(4) COMMENT '褰掓。鏍囪瘑';");
+ }
+
+
+ FieldSetEntity timedTask = baseDao.getFieldSetByFilter("product_sys_timed_task", "job_name=? and invoke_target like concat('%',?,'%') ", new String[]{fse.getString("filing_name") + "瀹氭椂", fse.getString("uuid")}, false);
+ String timeTaskUuid=null;
+ if (!FieldSetEntity.isEmpty(timedTask)){
+ timeTaskUuid=timedTask.getUUID();
+ }
+ boolean re = baseDao.saveFieldSetEntity(fse);
+ createdTimeTask(fse.getString("filing_name"),fse.getString("cron"),fse.getUUID(),timeTaskUuid);
+ return re;
+ }
+ private FieldSetEntity createdTimeTask(String target_table, String execute_time, String task_uuid, String timeTaskUuid) throws BaseException {
+ //
+ FieldSetEntity fse = new FieldSetEntity();
+ try {
+ fse.setTableName("product_sys_timed_task");
+ fse.setValue("uuid", timeTaskUuid);
+ fse.setValue("job_name", target_table + "瀹氭椂");//浠诲姟鍚嶇О
+ fse.setValue("job_group", "system");//鍒嗙粍
+ fse.setValue("invoke_target", "documentDirectoryService.fileTime('" + task_uuid + "')");//璋冪敤鐩爣瀛楃涓�
+ fse.setValue("cron_expression", execute_time);//cron琛ㄨ揪寮�
+ fse.setValue("misfire_policy", "3");//閿欒鎵ц绛栫暐 鍙墽琛屼竴娆�
+ fse.setValue("concurrent", 0);//涓嶅厑璁稿苟鍙戞墽琛�
+ fse.setValue("remark", target_table + "瀹氭椂");
+ fse.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fse.setValue("created_utc_datetime", new Date());
+ fse.setValue("status", 1);
+ fse.setValue("is_conceal", 1);
+ if (!com.product.common.lang.StringUtils.isEmpty(timeTaskUuid)) {
+ sysJobService.updateJob(fse);
+ } else {
+ sysJobService.insertJob(fse);
+ }
+ return fse;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new BaseException(DocumentCode.CRATED_TIMED_TASK_FAIL);
+ }
+//
+ }
+ /**
+ * 褰掓。瀹氭椂浠诲姟
+ */
+ @Transactional
+ public void fileTime(String uuid){
+ FieldSetEntity fs = baseDao.getFieldSet(CmnConst.PRODUCT_AO_FILING_CONFIG,uuid,false);
+ FieldSetEntity functionUuid = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_FUNCTIONS, fs.getString("function_uuid"), false);
+ DataTableEntity fieldTable = baseDao.listTable(CmnConst.PRODUCT_SYS_DATAMODEL_FIELD, "table_uuid=? and (field_type='file' or field_name='flow_flag')", new String[]{functionUuid.getString("table_uuid")}," field_type ");
+
+ FieldSetEntity table = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_DATAMODEL_TABLE, functionUuid.getString("table_uuid"), false);
+ StringBuilder sb = new StringBuilder();
+ sb.append("select concat(");
+ String flow_flag="";
+ for (int i = 0; i <fieldTable.getRows() ; i++) {
+ if (i==0&&!fieldTable.getString(i, "field_name").equals("flow_flag")){
+ sb.append("a.").append(fieldTable.getString(i, "field_name"));
+ }else if (i!=0&&!fieldTable.getString(i, "field_name").equals("flow_flag")){
+ sb.append(",',',").append("a.").append(fieldTable.getString(i, "field_name"));
+
+ }else if (fieldTable.getString(i,"field_name").equals("flow_flag")){
+ flow_flag=" and a.flow_flag=2";
+ }
+ }
+ sb.append(") file,a.uuid,b.uuid directory_uuid,");
+ sb.append("a.").append(fs.getString("field_title"));
+ sb.append(",a.").append(fs.getString("field_send_time")).append(" send_time");
+ sb.append(",c.user_name ");
+ sb.append(" from ");
+ sb.append(table.getString("table_name")).append(" a ");
+ sb.append(" LEFT JOIN (SELECT uuid,directory_name,filing_config_field_uuid FROM product_oa_directory where filing_config_table=? and tricode_parent='").append(fs.getString("filing_catalog")).append("') b ");
+ sb.append("on a.").append(fs.getString("field_title")).append("=b.directory_name and a.uuid=b.filing_config_field_uuid ");
+
+ sb.append(" LEFT JOIN product_sys_users c on a.").append(fs.getString("field_send_user")).append("=c.user_id");
+ sb.append(" where (a.archive_flag!=1 or a.archive_flag is null) ");
+ sb.append(flow_flag);
+ sb.append(" ORDER BY a.id LIMIT 1000 ");
+
+ //鑾峰彇娴佺▼閲岄潰鐨勯檮浠秙ql
+ StringBuffer nodeSal = new StringBuffer();
+ nodeSal.append(" select a.uuid,b.flow_attachment from ");
+ nodeSal.append(table.getString("table_name")).append(" a ");
+ nodeSal.append(" LEFT JOIN product_sys_flow_detail b on a.uuid=b.record_uuid ");
+ nodeSal.append(" where (a.archive_flag!=1 or a.archive_flag is null) and b.flow_attachment is not null");
+ nodeSal.append(flow_flag);
+ nodeSal.append(" ORDER BY a.id LIMIT 1000 ");
+
+ fieldLimit(sb.toString(),nodeSal.toString(),fs.getString("field_title"),fs.getString("filing_catalog"),fs.getString("turn_button"),table.getString("table_name"));
+
+
+ }
+
+ /**
+ *
+ * @param sql
+ * @param field_title 鏍囬瀛楁
+ * @param filing_catalog 鐖剁骇褰掓。鐩綍
+ */
+ private void fieldLimit(String sql,String nodeSal,String field_title,String filing_catalog,String turn_button,String table){
+
+ //鑾峰彇鐖剁被鏂囨。淇℃伅
+ FieldSetEntity parentDirectory = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?", new String[]{filing_catalog}, false);
+ DataTableEntity fieldDt = baseDao.listTable(sql, new String[]{table});
+ //鑾峰彇娴佺▼闄勪欢骞跺姞鍏ュ埌file閲�
+ DataTableEntity nodeDt = baseDao.listTable(nodeSal, new String[]{});
+ for (int i = 0; i <nodeDt.getRows() ; i++) {
+ FieldSetEntity fieldfs = fieldDt.getFieldSetEntity(nodeDt.getString(i, "uuid")).get(0);
+ if (!FieldSetEntity.isEmpty(fieldfs)){
+ if (StringUtils.isEmpty(fieldfs.getString("file"))){
+ fieldfs.setValue("file",nodeDt.getString(i,"flow_attachment"));
+ }else {
+ fieldfs.setValue("file",fieldfs.getString("file")+","+nodeDt.getString(i,"flow_attachment"));
+ }
+ }
+ }
+
+ ArrayList<String> fileList = new ArrayList<>();
+ for (int i = 0; i <fieldDt.getRows() ; i++) {
+ String file = fieldDt.getString(i, "file");
+ if (!StringUtils.isEmpty(file)){
+ for (int j = 0; j < file.split(",").length; j++) {
+ fileList.add(file.split(",")[j]);
+ }
+ }
+ }
+ DataTableEntity attachments = baseDao.listTable(CmnConst.PRODUCT_SYS_ATTACHMENTS, BaseUtil.buildQuestionMarkFilter("uuid", fileList.size(), true), fileList.toArray(new String[0]));
+ if (fieldDt.getRows()>0) {
+ for (int i = 0; i < fieldDt.getRows(); i++) {
+ FieldSetEntity fs = fieldDt.getFieldSetEntity(i);
+ String directoryUUID=null;
+ if (StringUtils.isEmpty(fs.getString("directory_uuid"))){
+ //鏍规嵁涓婄骇鐩綍鑾峰彇鐩綍缂栧彿
+ String tricode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE, filing_catalog);
+ //鑾峰彇鐩綍鍚嶇О
+ String title = fs.getString(field_title);
+ directoryUUID = addDirectory(title, tricode, filing_catalog, parentDirectory.getInteger("directory_tier") + 1,fs.getUUID(),table);
+
+ }else {
+ directoryUUID=fs.getString("directory_uuid");
+ }
+ String file = fs.getString("file");
+ if (!StringUtils.isEmpty(file)){
+ for (int j = 0; j <file.split(",").length ; j++) {
+ //鍒涘缓鏂囦欢
+ String f = file.split(",")[j];
+ if (StringUtils.isEmpty(file.split(",")[j])||DataTableEntity.isEmpty(attachments)){
+ continue;
+ }
+ FieldSetEntity attachmentsFs = attachments.getFieldSetEntity(f).get(0);
+ FieldSetEntity document = new FieldSetEntity();
+ document.setTableName(CmnConst.PRODUCT_OA_DOCUMENT);
+ document.setValue("directory_uuid",directoryUUID);
+ document.setValue("file_name",attachmentsFs.getString("file_name"));
+ document.setValue("attachments_uuid",f);
+ String[] type = f.split("\\.");
+ document.setValue("file_type",type[type.length-1]);
+ document.setValue("created_by", 1);
+ document.setValue("created_utc_datetime", new Date());
+ document.setValue("file_size", attachmentsFs.getString("attachment_size"));
+ baseDao.saveFieldSetEntity(document);
+ }
+ }
+ FieldSetEntity document = new FieldSetEntity();
+ document.setTableName(CmnConst.PRODUCT_OA_DOCUMENT);
+ document.setValue("directory_uuid",directoryUUID);
+ document.setValue("file_name",fs.getString(field_title)+" "+fs.getString("user_name")+" "+fs.getString("send_time"));
+ document.setValue("created_by", 1);
+ document.setValue("created_utc_datetime", new Date());
+ document.setValue("turn_button", turn_button);
+ document.setValue("file_size", 0);
+ document.setValue("file_type","铏氭嫙鏂囨。");
+
+ baseDao.saveFieldSetEntity(document);
+ baseDao.executeUpdate("UPDATE "+table+" set archive_flag =1 where uuid=?",new String[]{fs.getUUID()});
+ }
+ fieldLimit(sql,nodeSal,field_title,filing_catalog,turn_button,table);
+ }
+ }
+
+ /**
+ *
+ * @param field_title 鐩綍鏍囬
+ * @param tricode 缂栧彿
+ * @param tricode_parent 鐖剁骇缂栧彿
+ * @param directory_tier 鐩綍灞傜骇
+ */
+
+ private String addDirectory(String field_title,String tricode,String tricode_parent,Integer directory_tier,String filing_config_field_uuid,String table){
+ //鏂板缓鐩綍
+ FieldSetEntity fsDirectory = new FieldSetEntity();
+ fsDirectory.setTableName(CmnConst.PRODUCT_OA_DIRECTORY);
+ fsDirectory.setValue("created_by", 1);
+ fsDirectory.setValue("created_utc_datetime", new Date());
+ fsDirectory.setValue("org_level_uuid", "00000000-0000-0000-0000-000000000000");
+ fsDirectory.setValue("directory_name", field_title);
+ fsDirectory.setValue("directory_tier", directory_tier);
+ fsDirectory.setValue("directory_type", 1);
+ fsDirectory.setValue("tricode", tricode);
+ fsDirectory.setValue("tricode_parent", tricode_parent);
+ fsDirectory.setValue("filing_config_field_uuid", filing_config_field_uuid);
+ fsDirectory.setValue("filing_config_table", table);
+
+ baseDao.saveFieldSetEntity(fsDirectory);
+ return fsDirectory.getUUID();
+ }
+
+
+
+
@Override
@@ -190,7 +438,9 @@
JSONArray menus = this.encapsulationTree(data);
// 鑾峰彇褰撳墠鍏徃
JSONObject orgLevelInfo = new JSONObject();
- orgLevelInfo.put("directory_name", user.getOrg_level_name());
+ String orgLevelName = user.getOrg_level_name();
+
+ orgLevelInfo.put("directory_name", orgLevelName);
orgLevelInfo.put("tricode", "");
orgLevelInfo.put("org_level_uuid", user.getOrg_level_uuid());
orgLevelInfo.put("children", menus);
@@ -200,7 +450,7 @@
sql.setLength(0);
sql.append(" SELECT\n");
sql.append(" ( SELECT count(*) FROM product_oa_document_collection WHERE document_collector = ? ) collection_count,\n");
- sql.append(" ( SELECT count( sub_uuid ) FROM product_oa_document_borrow_sub WHERE borrow_uuid IN ( SELECT uuid FROM product_oa_document_borrow WHERE borrower = ? and flow_flag= 2 ) ) borrow_count\n");
+ sql.append(" ( SELECT count( sub_uuid ) FROM product_oa_document_borrow_sub WHERE borrow_uuid IN ( SELECT uuid FROM product_oa_document_borrow WHERE borrower = ? ) GROUP BY sub_uuid ) borrow_count\n");
sql.append(" FROM\n");
sql.append("DUAL\n");
FieldSetEntity fieldSetBySQL = baseDao.getFieldSetBySQL(sql.toString(), new Object[]{user.getUser_id(), user.getUser_id()}, false);
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index a53d8b6..9b6469d 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -143,11 +143,12 @@
StringBuffer sql = new StringBuffer();
sql.append("SELECT \n");
- sql.append(" A.*,B.show_name name, \n");
+ sql.append(" E.route_name,A.*,B.show_name name, \n");
sql.append(" CONCAT(CONVERT(a.file_size / 1024, decimal(10,2)), 'KB') file_size_kb, \n");
sql.append(" CASE WHEN D.document_uuid IS NOT NULL THEN '1' ELSE '0' END AS is_collection, \n");
sql.append(" (SELECT case when COUNT(*)=0 then 1 else COUNT(*) end FROM product_oa_document_history where product_oa_document_history.document_uuid=A.uuid) -1 history_count ");
- sql.append("FROM( \n");
+ sql.append(" ,if(A.turn_button is null,'鍚�','鏄�') turn");
+ sql.append(" FROM( \n");
if ("!borrow".equals(directory_uuid)) {
//鍊熼槄鏂囦欢澶规煡璇㈡枃浠剁壒娈婂鐞�
sql.append("SELECT\n");
@@ -183,6 +184,8 @@
sql.append("LEFT JOIN product_sys_staffs B ON B.user_id = A.created_by \n");
sql.append("LEFT JOIN product_sys_attachments C ON C.uuid = B.staff_avatar \n");
sql.append("LEFT JOIN product_oa_document_collection D ON D.document_uuid = A.uuid AND D.created_by = ?");
+ sql.append("LEFT JOIN product_sys_function_buttons E ON E.uuid = A.turn_button ");
+
DataTableEntity documentData = baseDao.listTable(sql.toString(), new String[]{directory_uuid, SpringMVCContextHolder.getCurrentUserId()},
fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
baseDao.listInternationDataTable(documentData, null);
@@ -337,13 +340,14 @@
String directory_uuid = fieldSetEntity.getString(CmnConst.DIRECTORY_UUID);
//String key = "%,140,%";
DataTableEntity dataTableEntity = new DataTableEntity();
- FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
+
+ FieldSetEntity org = recursionRole(directory_uuid);
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) ")
.append(" WHERE a.directory_uuid = ? ");
- dataTableEntity = baseDao.listTable(sql.toString(), new String[]{directory_uuid});
+ dataTableEntity = baseDao.listTable(sql.toString(), new String[]{org.getString("directory_uuid")});
}
StringBuffer button = new StringBuffer();
if (!BaseUtil.dataTableIsEmpty(dataTableEntity)) {
@@ -393,6 +397,21 @@
return fse;
}
+ /**
+ * 閫掑綊鑾峰彇鏉冮檺濡傛灉褰撳墠鏂囨。鏈厤缃潈闄愬氨鍘婚�掑綊鏌ヨ鐖剁骇鏉冮檺
+ * @param directory_uuid
+ * @return
+ */
+ private FieldSetEntity recursionRole(String directory_uuid){
+ FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
+ if (FieldSetEntity.isEmpty(org)&&!StringUtils.isEmpty(directory_uuid)){
+ FieldSetEntity directoryFs = baseDao.getFieldSet(CmnConst.PRODUCT_OA_DIRECTORY, directory_uuid,false);
+ FieldSetEntity parentFs = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?",new String[]{directoryFs.getString("tricode_parent")},false);
+ org=recursionRole(parentFs.getUUID());
+ }
+ return org;
+ }
+
@Override
public JSONObject popBoxGetFileDirectory(FieldSetEntity fse) throws BaseException {
//鏂囦欢鐩綍uuid
diff --git a/src/main/java/com/product/file/service/ide/IDocumentDirectoryService.java b/src/main/java/com/product/file/service/ide/IDocumentDirectoryService.java
index 6893feb..8ea035c 100644
--- a/src/main/java/com/product/file/service/ide/IDocumentDirectoryService.java
+++ b/src/main/java/com/product/file/service/ide/IDocumentDirectoryService.java
@@ -23,8 +23,9 @@
* @return
*/
boolean saveDocumentDireactory(FieldSetEntity fse);
-
- /**
+ boolean saveFileConfig(FieldSetEntity fse);
+
+ /**
* 鍒犻櫎鏂囨。鐩綍
* @param
* @return
--
Gitblit v1.9.2