1.修复文档库复制目录功能

src/main/java/com/baosight/hggp/hg/wd/domain/HGWD001.java

@@ -47,7 +47,7 @@ public class HGWD001 extends DaoEPBase {
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
 	public static final String FIELD_RELEASE_DATE = "releaseDate";  /* 发布时间*/
 	public static final String FIELD_FILE_PATH = "filePath";    		/* 文件路径*/
-	public static final String FIELD_FILE_ID_PATH = "filePath";    		/* 文件ID路径*/
+	public static final String FIELD_FILE_ID_PATH = "fileIdPath";    		/* 文件ID路径*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001.java

@@ -517,7 +517,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
 			}*/
 			// 要复制目录集合
 			if (Objects.nonNull(detail2Rows)) {
-				String parentId = detail2Rows.get(0).getFileId().length() > 0 ? detail2Rows.get(0).getFileId()
+				String parentId = detail2Rows.get(0).getFileId().trim().length() > 0 ? detail2Rows.get(0).getFileId()
 						: detail2Rows.get(0).getProjCode();
 				if (!StringUtils.isNull(result2Rows)) {
 					result2Rows.forEach(hgwd001 -> {

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml

@@ -419,9 +419,11 @@
                 '' as "FILE_ID",  <!-- 文件ID -->
                 '' as "FILE_TYPE",  <!-- 文件类型 -->
                 '' as "FILE_NAME",  <!-- 文件名称 -->
-                PROJECT_SOURCE as "FILE_PATH",
-                PROJ_CODE as "FILE_ID_PATH"
-            FROM ${hggpSchema}.HGSC001 T WHERE 1=1
+                case when te.ITEM_CNAME is null then concat(project_source,'/',PROJ_NAME) else concat(ITEM_CNAME,'/',PROJ_NAME) end as "FILE_PATH",
+                concat(project_source,'/',PROJ_CODE) as "FILE_ID_PATH"
+            FROM ${hggpSchema}.HGSC001 T
+            left join iplat_hggp.tedcm01 te on T.project_source = te.ITEM_CODE and te.CODESET_CODE = 'app.sc.projectSource'
+            WHERE 1=1
             <isNotEmpty prepend=" AND " property="accountCode">
                 ACCOUNT_CODE = #accountCode#
             </isNotEmpty>

src/main/webapp/HG/WD/HGWD001.jsp

@@ -168,7 +168,7 @@
 		<EF:EFGrid blockId="detail2" autoDraw="override" autoBind="false" isFloat="true" checkMode="single" queryMethod="queryDetail2">
 			<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="parentId" cname="上级ID" hidden="true"/>
-			<EF:EFColumn ename="filePath" cname="文件路径" hidden="true"/>
+			<EF:EFColumn ename="filePath" cname="文件路径" hidden="false"/>
 			<%--<EF:EFComboColumn ename="projCode" cname="项目名称" blockName="proj_record_block_id"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#"
 							  textField="textField" valueField="valueField"
@@ -189,7 +189,7 @@
 		<EF:EFGrid blockId="result2" autoDraw="override" autoBind="false" isFloat="true" checkMode="row " queryMethod="query2">
 			<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="parentId" cname="上级ID" hidden="true"/>
-			<EF:EFColumn ename="filePath" cname="文件路径" hidden="true"/>
+			<EF:EFColumn ename="filePath" cname="文件路径" hidden="false"/>
 			<%--<EF:EFComboColumn ename="projCode" cname="项目名称" blockName="proj_record_block_id"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#"
 							  textField="textField" valueField="valueField"