From c2accc29d778a9631cebcb494586909cba6f9464 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 19:50:55 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1
---
packages/utils/area.ts | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/packages/utils/area.ts b/packages/utils/area.ts
index aa4c806..c41d617 100644
--- a/packages/utils/area.ts
+++ b/packages/utils/area.ts
@@ -2,7 +2,7 @@
export function formatAreaListToTree(
areaDataList: API.AreaTreeNode[],
- parentId = '',
+ parentId = null,
maxLayer = AreaType.Area
) {
const treeNodeList: API.AreaTreeNode[] = [];
@@ -11,7 +11,9 @@
const areaTreeNode: API.AreaTreeNode = { ...areaData };
if (areaData.parentCode === parentId && areaData.layer <= maxLayer) {
const children = formatAreaListToTree(areaDataList, areaData.areaCode, maxLayer);
- areaTreeNode.children = children;
+ if (children.length > 0) {
+ areaTreeNode.children = children;
+ }
treeNodeList.push(areaTreeNode);
}
});
--
Gitblit v1.9.1