update 合并菜单接口

Api/Ewide.Core/Service/Auth/AuthService.cs

@@ -245,8 +245,12 @@ namespace Ewide.Core.Service
             // 菜单信息
             if (loginOutput.Apps.Count > 0)
             {
-                var defaultActiveAppCode = loginOutput.Apps.FirstOrDefault(u => u.Active == true).Code; // loginOutput.Apps[0].Code;
-                loginOutput.Menus = await _sysMenuService.GetLoginMenusAntDesign(userId, defaultActiveAppCode);
+                //var defaultActiveAppCode = loginOutput.Apps.FirstOrDefault(u => u.Active == true).Code; // loginOutput.Apps[0].Code;
+                //loginOutput.Menus = await _sysMenuService.GetLoginMenusAntDesign(userId, defaultActiveAppCode);
+                foreach (var app in loginOutput.Apps)
+                {
+                    loginOutput.Menus.AddRange(await _sysMenuService.GetLoginMenusAntDesign(userId, app.Code));
+                }
             }
 
             return loginOutput;

Api/Ewide.Core/Service/Menu/Dto/AntDesignTreeNode.cs

@@ -49,6 +49,8 @@
         /// 打开方式
         /// </summary>
         public int OpenType { get; set; }
+
+        public string Application { get; set; }
     }
 
     /// <summary>

Api/Ewide.Core/Service/Menu/SysMenuService.cs

@@ -116,7 +116,8 @@ namespace Ewide.Core.Service
                         Show = u.Visible,
                         Link = u.Link,
                         Target = u.OpenType == (int)MenuOpenType.OUTER ? "_blank" : ""
-                    }
+                    },
+                    Application = u.Application
                 }).ToList();
 
 #if DEBUG