From 4b5a4c322d5a777f2715e1574ab3ef7cbcf14d6d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 18:46:01 +0800
Subject: [PATCH] fix: 验收管理
---
packages/utils/area.ts | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/packages/utils/area.ts b/packages/utils/area.ts
index 1732267..c41d617 100644
--- a/packages/utils/area.ts
+++ b/packages/utils/area.ts
@@ -1,21 +1,19 @@
import { AreaType } from '@12333/constants';
-export interface AreaTreeNode extends API.AreaDto {
- children?: AreaTreeNode[];
-}
-
export function formatAreaListToTree(
- areaDataList: API.AreaDto[],
- parentId: number,
+ areaDataList: API.AreaTreeNode[],
+ parentId = null,
maxLayer = AreaType.Area
) {
const treeNodeList: API.AreaTreeNode[] = [];
if (areaDataList.length > 0) {
areaDataList.forEach((areaData) => {
const areaTreeNode: API.AreaTreeNode = { ...areaData };
- if (areaData.parentId === parentId && areaData.layer <= maxLayer) {
+ 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