From 6ae99bac7a29426b7079d6501e7aa1d968b188db Mon Sep 17 00:00:00 2001 From: zm <2369059705qq.com> Date: 星期四, 05 九月 2024 15:23:26 +0800 Subject: [PATCH] 归档优化 --- src/main/java/com/product/file/service/DocumentDirectoryService.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/product/file/service/DocumentDirectoryService.java b/src/main/java/com/product/file/service/DocumentDirectoryService.java index 06b2361..09e10da 100644 --- a/src/main/java/com/product/file/service/DocumentDirectoryService.java +++ b/src/main/java/com/product/file/service/DocumentDirectoryService.java @@ -200,7 +200,7 @@ 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 tricode_parent='").append(fs.getString("filing_catalog")).append("') b "); + 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"); @@ -232,7 +232,7 @@ //鑾峰彇鐖剁被鏂囨。淇℃伅 FieldSetEntity parentDirectory = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?", new String[]{filing_catalog}, false); - DataTableEntity fieldDt = baseDao.listTable(sql, new String[]{}); + DataTableEntity fieldDt = baseDao.listTable(sql, new String[]{table}); //鑾峰彇娴佺▼闄勪欢骞跺姞鍏ュ埌file閲� DataTableEntity nodeDt = baseDao.listTable(nodeSal, new String[]{}); for (int i = 0; i <nodeDt.getRows() ; i++) { @@ -265,7 +265,7 @@ 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()); + directoryUUID = addDirectory(title, tricode, filing_catalog, parentDirectory.getInteger("directory_tier") + 1,fs.getUUID(),table); }else { directoryUUID=fs.getString("directory_uuid"); @@ -317,7 +317,7 @@ * @param directory_tier 鐩綍灞傜骇 */ - private String addDirectory(String field_title,String tricode,String tricode_parent,Integer directory_tier,String filing_config_field_uuid){ + 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); @@ -330,6 +330,7 @@ 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(); -- Gitblit v1.9.2