From a5bf1277748c1c530dd2a5569d844ac746896a02 Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 19 Mar 2025 19:21:23 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3540:=20=E6=B7=BB=E5=8A=A0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/doc/file/index/IndexManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java index a717e0ff..c71fb22c 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexManager.java @@ -164,8 +164,7 @@ public class IndexManager { BizAssertions.assertTrue(indexNodeDao.validSubtreeFileCount(srcNode) <= docProps.getIndexNodeMaxCopyFileSize(), "拷贝文件数超过限制: {}", docProps.getIndexNodeMaxCopyFileSize()); IndexNode destParentNode = findOrNull(destParentCode); - if (destParentNode != null) - checkBeforeMoveOrCopy(srcNode, destParentNode, "克隆"); + checkBeforeMoveOrCopy(srcNode, destParentNode, "克隆"); return async(() -> { // don't inline in transaction CopyFileVisitor copyNodeVisitor = new CopyFileVisitor(copySubtreeOssFiles(srcNode)); @@ -180,8 +179,7 @@ public class IndexManager { public Future asyncMove(String srcCode, @Nullable String destParentCode) { IndexNode srcNode = getOrThrow(srcCode); IndexNode destParentNode = StringUtils.isBlank(destParentCode) ? null : getOrThrow(destParentCode); - if (destParentNode != null) - checkBeforeMoveOrCopy(srcNode, destParentNode, "移动"); + checkBeforeMoveOrCopy(srcNode, destParentNode, "移动"); return async(() -> { RootNode moveRoot = TreeBuilder.build(collectValidSubtreeAsValueRoot(srcNode)); return transaction.execute(unused -> { @@ -192,6 +190,8 @@ public class IndexManager { } private static void checkBeforeMoveOrCopy(IndexNode srcNode, IndexNode destParentNode, String op) { + if (destParentNode == null) + return; BizAssertions.assertFalse(srcNode.isDirectory() && destParentNode.isFile(), "不能{}文件夹到文件下", op); BizAssertions.assertFalse(srcNode.isSameNodeWith(destParentNode), "不能{}到同一节点下", op); BizAssertions.assertFalse(srcNode.isParentOf(destParentNode), "不能{}到子节点下", op);