diff --git a/apps/daxpay-admin/src/api/system/protocol/user-protocol-version.api.ts b/apps/daxpay-admin/src/api/system/basic/protocol/user-protocol-version.api.ts
similarity index 98%
rename from apps/daxpay-admin/src/api/system/protocol/user-protocol-version.api.ts
rename to apps/daxpay-admin/src/api/system/basic/protocol/user-protocol-version.api.ts
index d722f99fd..9e3026b8d 100644
--- a/apps/daxpay-admin/src/api/system/protocol/user-protocol-version.api.ts
+++ b/apps/daxpay-admin/src/api/system/basic/protocol/user-protocol-version.api.ts
@@ -19,7 +19,7 @@ export const UserProtocolVersionApi = {
     return defHttp.post({ url: '/user/protocol/version/add', data });
   },
   /** 查询新建草稿可继承的源版本(已发布优先, 否则最新归档) */
-  findInheritSource(protocolId: string, language: string): Promise<Result<UserProtocolVersion | null>> {
+  findInheritSource(protocolId: string, language: string): Promise<Result<null | UserProtocolVersion>> {
     return defHttp.get({
       url: '/user/protocol/version/find-inherit-source',
       params: { protocolId, language },
diff --git a/apps/daxpay-admin/src/api/system/protocol/user-protocol.api.ts b/apps/daxpay-admin/src/api/system/basic/protocol/user-protocol.api.ts
similarity index 100%
rename from apps/daxpay-admin/src/api/system/protocol/user-protocol.api.ts
rename to apps/daxpay-admin/src/api/system/basic/protocol/user-protocol.api.ts
diff --git a/apps/daxpay-admin/src/views/_core/authentication/components/AgreementContentView.vue b/apps/daxpay-admin/src/views/_core/authentication/components/AgreementContentView.vue
index 367ed8100..37d130750 100644
--- a/apps/daxpay-admin/src/views/_core/authentication/components/AgreementContentView.vue
+++ b/apps/daxpay-admin/src/views/_core/authentication/components/AgreementContentView.vue
@@ -6,7 +6,7 @@
   import dayjs from 'dayjs';
   import { MdPreview } from 'md-editor-v3';
 
-  import { UserProtocolApi, type UserProtocolContent } from '#/api/system/protocol/user-protocol.api';
+  import { UserProtocolApi, type UserProtocolContent } from '#/api/system/basic/protocol/user-protocol.api';
 
   import 'md-editor-v3/lib/preview.css';
 
diff --git a/apps/daxpay-admin/src/views/system/protocol/UserProtocolEdit.vue b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolEdit.vue
similarity index 99%
rename from apps/daxpay-admin/src/views/system/protocol/UserProtocolEdit.vue
rename to apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolEdit.vue
index 84dc2f5e5..d84e1a637 100644
--- a/apps/daxpay-admin/src/views/system/protocol/UserProtocolEdit.vue
+++ b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolEdit.vue
@@ -3,7 +3,7 @@
 
   import { $t } from '@vben/locales';
 
-  import { type UserProtocol, UserProtocolApi } from '#/api/system/protocol/user-protocol.api';
+  import { type UserProtocol, UserProtocolApi } from '#/api/system/basic/protocol/user-protocol.api';
   import { FormEditType } from '#/enums/formEditType';
   import { useFormEdit } from '#/hooks/useFormEdit';
   import { useMessage } from '#/hooks/useMessage';
diff --git a/apps/daxpay-admin/src/views/system/protocol/UserProtocolList.vue b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolList.vue
similarity index 97%
rename from apps/daxpay-admin/src/views/system/protocol/UserProtocolList.vue
rename to apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolList.vue
index 8e5c95e72..803e01b30 100644
--- a/apps/daxpay-admin/src/views/system/protocol/UserProtocolList.vue
+++ b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolList.vue
@@ -8,7 +8,7 @@
 
   import { IconifyIcon } from '@vben-core/icons';
 
-  import { UserProtocolApi } from '#/api/system/protocol/user-protocol.api';
+  import { UserProtocolApi } from '#/api/system/basic/protocol/user-protocol.api';
   import { BQuery, type QueryField } from '#/components/query';
   import { FormEditType } from '#/enums/formEditType';
   import { useMessage } from '#/hooks/useMessage';
@@ -223,12 +223,8 @@
 
   /** 确认复制 */
   async function confirmCopy() {
-    try {
-      await copyFormRef.value?.validate();
-    } catch {
-      // 校验失败: 表单已显示错误提示; 拒绝以阻止 modal 关闭
-      return Promise.reject();
-    }
+    // 校验失败: 表单已显示错误提示; 抛出异常以阻止 modal 关闭
+    await copyFormRef.value?.validate();
     return UserProtocolApi.copyToClient(copySourceId.value, copyForm.value.clientType!).then(() => {
       message.success($t('common.operationSuccess'));
       copyVisible.value = false;
diff --git a/apps/daxpay-admin/src/views/system/protocol/UserProtocolVersionEdit.vue b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolVersionEdit.vue
similarity index 98%
rename from apps/daxpay-admin/src/views/system/protocol/UserProtocolVersionEdit.vue
rename to apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolVersionEdit.vue
index a9ffa2eb3..346472970 100644
--- a/apps/daxpay-admin/src/views/system/protocol/UserProtocolVersionEdit.vue
+++ b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolVersionEdit.vue
@@ -5,7 +5,10 @@
 
   import { MdEditor, MdPreview } from 'md-editor-v3';
 
-  import { type UserProtocolVersion, UserProtocolVersionApi } from '#/api/system/protocol/user-protocol-version.api';
+  import {
+    type UserProtocolVersion,
+    UserProtocolVersionApi,
+  } from '#/api/system/basic/protocol/user-protocol-version.api';
   import { FormEditType } from '#/enums/formEditType';
   import { useFormEdit } from '#/hooks/useFormEdit';
   import { useMessage } from '#/hooks/useMessage';
diff --git a/apps/daxpay-admin/src/views/system/protocol/UserProtocolVersionList.vue b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolVersionList.vue
similarity index 99%
rename from apps/daxpay-admin/src/views/system/protocol/UserProtocolVersionList.vue
rename to apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolVersionList.vue
index 9dd6b65a7..fa4b96ab8 100644
--- a/apps/daxpay-admin/src/views/system/protocol/UserProtocolVersionList.vue
+++ b/apps/daxpay-admin/src/views/system/basic/protocol/UserProtocolVersionList.vue
@@ -4,10 +4,11 @@
 
   import { ref } from 'vue';
 
-  import { IconifyIcon } from '@vben-core/icons';
   import { $t } from '@vben/locales';
 
-  import { UserProtocolVersionApi } from '#/api/system/protocol/user-protocol-version.api';
+  import { IconifyIcon } from '@vben-core/icons';
+
+  import { UserProtocolVersionApi } from '#/api/system/basic/protocol/user-protocol-version.api';
   import { FormEditType } from '#/enums/formEditType';
   import { useMessage } from '#/hooks/useMessage';