From f112ef31608f1a9dc75686baeee3085799f28661 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 24 Apr 2024 22:32:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9D=83=E9=99=90=E9=80=92=E5=BD=92?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Menu/Services/Implements/MenuService.cs     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs b/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs
index 6092f066..130efa5d 100644
--- a/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs
+++ b/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs
@@ -119,8 +119,21 @@ public class MenuService : IMenuService
 
     public async Task<List<string>> GetAllAssignmentPermissionsAsync()
     {
-        var all = await GetAllAssignmentCodesAsync();
-        return await _dbContext.Queryable<MenuEntity>().Where(x => all.Contains(x.Code)).Select(x => x.Permission).ToListAsync();
+        var menus = await GetCurrentMenusAsync();
+        return GetPermissions(menus).ToList();
+
+        IEnumerable<string> GetPermissions(List<MenuResponse> innerMenuResponses)
+        {
+            foreach (var item in innerMenuResponses)
+            {
+                yield return item.Permission;
+
+                foreach (var item1 in GetPermissions(item.Items))
+                {
+                    yield return item1;
+                }
+            }
+        }
     }
 
     public async Task<List<MenuResponse>> GetCurrentMenusAsync()