feat 二级路由更改及设备人员数据

Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs

@@ -42,7 +42,7 @@ public class MenuService : IMenuService
     }
 
     [Transactional]
-    public async Task SaveMenuAsync(SaveMenuRequest request)
+    public async Task<string> SaveMenuAsync(SaveMenuRequest request)
     {
         await CheckAsync(request);
 
@@ -50,6 +50,7 @@ public class MenuService : IMenuService
         {
             var entity = request.Adapt<MenuEntity>();
             await _dbContext.InsertAsync(entity);
+            return entity.Code;
         }
         else
         {
@@ -59,6 +60,7 @@ public class MenuService : IMenuService
             request.Adapt(entity);
 
             await _dbContext.UpdateAsync(entity);
+            return entity.Code;
         }
     }
 
@@ -187,9 +189,10 @@ public class MenuService : IMenuService
 
         foreach (var item in request)
         {
-            await SaveMenuAsync(item);
+            var code = await SaveMenuAsync(item);
             if (item.Items?.Any() == true)
             {
+                item.Items.ForEach(x => x.PCode = code);
                 await RecursionSaveNextAsync(item.Items);
             }
         }
@@ -199,9 +202,11 @@ public class MenuService : IMenuService
         {
             foreach (var item in menus)
             {
-                await SaveMenuAsync(item);
+                var code = await SaveMenuAsync(item);
+
                 if (item.Items?.Any() == true)
                 {
+                    item.Items.ForEach(x => x.PCode = code);
                     await RecursionSaveNextAsync(item.Items);
                 }
             }
@@ -221,6 +226,7 @@ public class MenuService : IMenuService
 
     private async Task CheckAsync(SaveMenuRequest request)
     {
+
         //检查重复code
         var exists = await _dbContext.Queryable<MenuEntity>()
             .Where(x => x.Code == request.Code)
@@ -248,7 +254,11 @@ public class MenuService : IMenuService
 
         if (request.MenuType == MenuEnumType.Folder)
         {
-            request.PCode = null;
+            //request.PCode = null;
+            if (string.IsNullOrEmpty(request.PCode))
+            {
+                request.PCode = null;
+            }
         }
         else if (request.MenuType == MenuEnumType.Menu)
         {
@@ -300,4 +310,6 @@ public class MenuService : IMenuService
             await _dbContext.UpdateAsync(permissions);
         }
     }
+
+  
 }