diff --git a/apps/web-antd/src/api/erp/product/category/index.ts b/apps/web-antd/src/api/erp/product/category/index.ts
index 3887b1217..87c855319 100644
--- a/apps/web-antd/src/api/erp/product/category/index.ts
+++ b/apps/web-antd/src/api/erp/product/category/index.ts
@@ -1,5 +1,4 @@
 import { requestClient } from '#/api/request';
-import type {PageParam} from '@vben/request';
 
 export namespace ErpProductCategoryApi {
   /** ERP 产品分类信息 */
@@ -15,7 +14,7 @@ export namespace ErpProductCategoryApi {
 }
 
 /** 查询产品分类列表 */
-export function getProductCategoryList(params: any) {
+export function getProductCategoryList(params?: any) {
   return requestClient.get<ErpProductCategoryApi.ProductCategory[]>(
     '/erp/product-category/list',
     { params },
diff --git a/apps/web-antd/src/views/erp/product/category/modules/form.vue b/apps/web-antd/src/views/erp/product/category/modules/form.vue
index f1de8b4e3..a8c6be623 100644
--- a/apps/web-antd/src/views/erp/product/category/modules/form.vue
+++ b/apps/web-antd/src/views/erp/product/category/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getProductCategory(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/erp/product/unit/modules/form.vue b/apps/web-antd/src/views/erp/product/unit/modules/form.vue
index 05b8a4693..eac42a05a 100644
--- a/apps/web-antd/src/views/erp/product/unit/modules/form.vue
+++ b/apps/web-antd/src/views/erp/product/unit/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getProductUnit(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
index e430bf2b6..22614a609 100644
--- a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo01Contact(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
index 4c009b21f..3f4e9f79c 100644
--- a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo02Category(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
index bf4c20f1a..552d950ee 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo03Student(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/product/property/modules/property-form.vue b/apps/web-antd/src/views/mall/product/property/modules/property-form.vue
index e6765a4d8..0af8accb9 100644
--- a/apps/web-antd/src/views/mall/product/property/modules/property-form.vue
+++ b/apps/web-antd/src/views/mall/product/property/modules/property-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getProperty(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
index 2674c3734..1d4e4eef2 100644
--- a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
+++ b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
@@ -77,9 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         formData.value = await getPropertyValue(data.id);
         // 设置到 values
-        if (formData.value) {
-          await formApi.setValues(formData.value);
-        }
+        await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
diff --git a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
index 4d3f3ed15..92047c4ab 100644
--- a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getCombinationActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
index 8ddedb845..260c7a98f 100644
--- a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiscountActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue b/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue
index bdd97adfd..5045bf240 100644
--- a/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyPage(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue b/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue
index 71a99d2ac..c262b70c7 100644
--- a/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue
@@ -82,9 +82,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyTemplate(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue
index a698f812b..f8103ef7a 100644
--- a/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getPointActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
index f9cc68058..cd2dc5e1d 100644
--- a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -79,9 +79,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getReward(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/dept/modules/form.vue b/apps/web-antd/src/views/system/dept/modules/form.vue
index 008a85d56..07430494f 100644
--- a/apps/web-antd/src/views/system/dept/modules/form.vue
+++ b/apps/web-antd/src/views/system/dept/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDept(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/dict/modules/data-form.vue b/apps/web-antd/src/views/system/dict/modules/data-form.vue
index a0e44bff1..0511d90c4 100644
--- a/apps/web-antd/src/views/system/dict/modules/data-form.vue
+++ b/apps/web-antd/src/views/system/dict/modules/data-form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictData(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/dict/modules/type-form.vue b/apps/web-antd/src/views/system/dict/modules/type-form.vue
index c055f880c..8de08d120 100644
--- a/apps/web-antd/src/views/system/dict/modules/type-form.vue
+++ b/apps/web-antd/src/views/system/dict/modules/type-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictType(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/menu/modules/form.vue b/apps/web-antd/src/views/system/menu/modules/form.vue
index e257fd26d..ae9662205 100644
--- a/apps/web-antd/src/views/system/menu/modules/form.vue
+++ b/apps/web-antd/src/views/system/menu/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getMenu(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/notice/modules/form.vue b/apps/web-antd/src/views/system/notice/modules/form.vue
index d15762e57..eac023885 100644
--- a/apps/web-antd/src/views/system/notice/modules/form.vue
+++ b/apps/web-antd/src/views/system/notice/modules/form.vue
@@ -67,9 +67,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getNotice(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue b/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue
index 548aac24d..d97dd9c89 100644
--- a/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue
+++ b/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo01Contact(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue b/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue
index 2e7ff1dc9..2f4a58124 100644
--- a/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue
+++ b/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo02Category(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue b/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue
index e56102da4..b0ad481d1 100644
--- a/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue
+++ b/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo03Student(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/product/property/modules/property-form.vue b/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
index b81e01625..8bc468410 100644
--- a/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getProperty(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
index 48f6db6ef..1be3dcf86 100644
--- a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
@@ -77,9 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         formData.value = await getPropertyValue(data.id);
         // 设置到 values
-        if (formData.value) {
-          await formApi.setValues(formData.value);
-        }
+        await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
diff --git a/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
index ba8f8f858..7781fd5b9 100644
--- a/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getCombinationActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
index 7feafc1f4..c1b67fe6f 100644
--- a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiscountActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue b/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
index 7004377d3..e128ce9b8 100644
--- a/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyPage(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue b/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
index cb3e2af09..886d3946e 100644
--- a/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
@@ -82,9 +82,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyTemplate(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue
index 3df1c2b5a..5bded7559 100644
--- a/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getPointActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
index 9e89c5a8f..e1c74b702 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -79,9 +79,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getReward(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/dept/modules/form.vue b/apps/web-ele/src/views/system/dept/modules/form.vue
index cf8aa2a13..b0136188b 100644
--- a/apps/web-ele/src/views/system/dept/modules/form.vue
+++ b/apps/web-ele/src/views/system/dept/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDept(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/dict/modules/data-form.vue b/apps/web-ele/src/views/system/dict/modules/data-form.vue
index b518e4496..6f3203088 100644
--- a/apps/web-ele/src/views/system/dict/modules/data-form.vue
+++ b/apps/web-ele/src/views/system/dict/modules/data-form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictData(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/dict/modules/type-form.vue b/apps/web-ele/src/views/system/dict/modules/type-form.vue
index 5c9591c78..5e7cce34c 100644
--- a/apps/web-ele/src/views/system/dict/modules/type-form.vue
+++ b/apps/web-ele/src/views/system/dict/modules/type-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictType(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/menu/modules/form.vue b/apps/web-ele/src/views/system/menu/modules/form.vue
index 0662193ea..9a91c16f5 100644
--- a/apps/web-ele/src/views/system/menu/modules/form.vue
+++ b/apps/web-ele/src/views/system/menu/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getMenu(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/notice/modules/form.vue b/apps/web-ele/src/views/system/notice/modules/form.vue
index 1b8c8d6b6..f00a4972d 100644
--- a/apps/web-ele/src/views/system/notice/modules/form.vue
+++ b/apps/web-ele/src/views/system/notice/modules/form.vue
@@ -67,9 +67,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getNotice(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }