From a607cfed5648dca4f2ef76b5975e14edfe9de090 Mon Sep 17 00:00:00 2001
From: xy <10816187@qq.com>
Date: Wed, 27 Nov 2024 15:49:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95tree=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/pages/menu/form.tsx                 |  4 ++--
 admin/src/routes.ts                           | 20 ++++++++-----------
 server/.env                                   |  2 +-
 .../src/modules/system/menu/menu.service.ts   | 19 +++++++-----------
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/admin/src/pages/menu/form.tsx b/admin/src/pages/menu/form.tsx
index 22190d8..85a6533 100644
--- a/admin/src/pages/menu/form.tsx
+++ b/admin/src/pages/menu/form.tsx
@@ -38,7 +38,7 @@ export default function FormComponent(props: Props) {
 		const {data} = await getMenu();
 		const mergeMenu = [
 			{
-				id: 0,
+				id: null,
 				name: '无父级'
 			},
 			...data
@@ -73,7 +73,7 @@ export default function FormComponent(props: Props) {
 					<Form.Item hidden field="id">
 						<Input/>
 					</Form.Item>
-					<Form.Item label="父级菜单" field="parentId" rules={[{required: true}]}>
+					<Form.Item label="父级菜单" field="parentId">
 						<Select
 							placeholder="请选择父级菜单"
 							allowClear
diff --git a/admin/src/routes.ts b/admin/src/routes.ts
index 85a88d5..aa4988c 100644
--- a/admin/src/routes.ts
+++ b/admin/src/routes.ts
@@ -12,21 +12,17 @@ export type IRoute = AuthParams & {
   icon?: string
 };
 
-const generatorMenu = (data, parentId?:string) => {
+const generatorMenu = (data, parentId = '-') => {
   const menu = [];
   for (const item of data) {
     item.key = item.url;
-    if(!parentId){
-      menu.push(item);
-    }else{
-      if (item.parentId === parentId) {
-        const children = generatorMenu(data, item.id);
-        if (children.length) {
-          item.children = children;
-        }
-        menu.push(item);
-      }
-    }
+	  if ((item.parentId || '-') === parentId) {
+		  const children = generatorMenu(data, item.id);
+		  if (children.length) {
+			  item.children = children;
+		  }
+		  menu.push(item);
+	  }
   }
   return menu;
 };
diff --git a/server/.env b/server/.env
index d97fe3e..01ef346 100644
--- a/server/.env
+++ b/server/.env
@@ -1 +1 @@
-DATABASE_URL="postgresql://postgres:ultimate@81.70.149.52:8000/promise?schema=public"
+DATABASE_URL="postgresql://postgres:ultimate@81.70.149.52:8000/nestjs-admin?schema=public"
diff --git a/server/src/modules/system/menu/menu.service.ts b/server/src/modules/system/menu/menu.service.ts
index 47c4c22..b61d98d 100644
--- a/server/src/modules/system/menu/menu.service.ts
+++ b/server/src/modules/system/menu/menu.service.ts
@@ -35,20 +35,15 @@ export class MenuService {
     });
   }
 
-  generatorMenu(data, parentId?: string) {
+  generatorMenu(data, parentId = '-') {
     const menu = [];
     for (const item of data) {
-      // 不存在父id 代表是顶级菜单
-      if (!parentId) {
-        menu.push(item);
-      } else {
-        if (item.parentId === parentId) {
-          const children = this.generatorMenu(data, item.id);
-          if (children.length) {
-            item.children = children;
-          }
-          menu.push(item);
+      if ((item.parentId || '-') === parentId) {
+        const children = this.generatorMenu(data, item.id);
+        if (children.length) {
+          item.children = children;
         }
+        menu.push(item);
       }
     }
     return menu;
@@ -56,7 +51,7 @@ export class MenuService {
 
   async getTreeMenu() {
     const query: Prisma.SysMenuFindManyArgs = {
-      orderBy: [{ sort: 'desc' }, { id: 'asc' }],
+      orderBy: [{ sort: 'desc' }, { createdAt: 'desc' }],
     };
     const list = await this.prisma.sysMenu.findMany(query);
     return this.generatorMenu(list);