Browse Source

客户级归档树编辑组卷规则

luok 2 năm trước cách đây
mục cha
commit
ddc9768f07

+ 5 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -1011,7 +1011,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//TODO wbs节点
 		//不存在跨节点 项目名称+案卷题名规则(在后台归档目录树设置的)+后缀
 		//存在跨节点  获取当前所有节点的父级节点题名规则+所有同层级跨节点并卷的节点名称拼接+后缀
-		return archiveName+node.getArchiveNameSuffix();
+		String archiveNameSuffix=node.getArchiveNameSuffix();
+		if(archiveNameSuffix==null || archiveNameSuffix.equals("null")){
+			archiveNameSuffix="";
+		}
+		return archiveName+archiveNameSuffix;
 	}
 	private String builtFilePageNo(ArchivesAuto archivesAuto,List<ArchiveFile> waitArchiveFiles){
 		//生成文件对应的页码,返回url