完成菜单加载

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -51,17 +51,17 @@ namespace OASystem.API.Controllers
             }
 
             #endregion
-            IActionResult authData = null;
+            Result authData = null;
             if (userData.Data != null)
             {
                 var uid = (userData.Data as UserLoginInfoView).UserId;
-                authData = await MenuLoad(new MenuLoadDto() { PortType = dto.PortType, UserId = uid });
+                authData = _SystemMenuPermissionRepository.QueryMenuLoad(uid, dto.PortType);
             }
 
             var view = new LoginView
             {
                 UserInfo = userData == null ? null : userData.Data,
-                AuthData = authData != null ? (authData as OkObjectResult).Value : null,
+                AuthData = authData == null ? null : authData,
             };
 
             DateTime createZebraTime = DateTime.Now;
@@ -184,67 +184,5 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(view));
         }
-
-
-
-        /// <summary>
-        /// 菜单加载
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [HttpPost("MenuLoad")]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> MenuLoad(MenuLoadDto dto)
-        {
-            var QueryResult = _SystemMenuPermissionRepository.QueryMenuLoad(dto.UserId,dto.PortType);
-            ArrayList arr = new ArrayList();
-            JsonView ViewData = new JsonView();
-            ViewData.Code = 400;
-            ViewData.Msg = "错误！";
-            ViewData.Data = null;
-
-            if (QueryResult.Code == 0)
-            {
-                if (dto.PortType == 1)
-                {
-                    var menuGroup = (QueryResult.Data as List<MenuLoadView>).GroupBy(x => x.modulid);
-                    foreach (var item in menuGroup)
-                    {
-                        var modul = item.FirstOrDefault();
-                        if (modul != null)
-                        {
-                            arr.Add(new
-                            {
-                                modulName = modul.modulName,
-                                modulid = modul.modulid,
-                                pageList = item
-                            });
-                        }
-                    }
-
-                    ViewData.Code = 200;
-                    ViewData.Msg = QueryResult.Msg;
-                    ViewData.Data = arr;
-
-                }
-                else if (dto.PortType == 2)
-                {
-                    var pages = (QueryResult.Data as List<MenuLoadView>).Select(x => x.pageid).ToArray();
-                    arr = ArrayList.Adapter(pages);
-
-                    ViewData.Code = 200;
-                    ViewData.Msg = QueryResult.Msg;
-                    ViewData.Data = arr;
-                }
-            }
-            else
-            {
-                ViewData.Msg = "错误！(" + QueryResult.Msg + ")";
-            }
-
-            return Ok(ViewData);
-        }
-
-
     }
 }

OASystem/OASystem.Infrastructure/Repositories/System/SystemMenuPermissionRepository.cs

@@ -1,6 +1,7 @@
 using OASystem.Domain;
 using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.System;
+using System.Collections;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
@@ -105,7 +106,33 @@ namespace OASystem.Infrastructure.Repositories.System
                 {
                     result.Code = 0;
                     result.Msg = "成功！";
-                    result.Data = DBData;
+                    var arr = new ArrayList();
+
+                    if (PortType == 1)
+                    {
+                        var menuGroup = DBData.GroupBy(x => x.modulid);
+                        foreach (var item in menuGroup)
+                        {
+                            var modul = item.FirstOrDefault();
+                            if (modul != null)
+                            {
+                                arr.Add(new
+                                {
+                                    modulName = modul.modulName,
+                                    modulid = modul.modulid,
+                                    pageList = item
+                                });
+                            }
+                        }
+
+                    }
+                    else if (PortType == 2)
+                    {
+                        var pages = DBData.Select(x => x.pageid).ToArray();
+                        arr = ArrayList.Adapter(pages);
+                    }
+
+                    result.Data = arr;
                 }
                
             }