页面修改

Edu.Model/CacheModel/UserInfo.cs

@@ -65,6 +65,11 @@ namespace Edu.Model.CacheModel
         /// </summary>
         public List<MenuTree_ViewModel> MenuList { get; set; }
 
+        /// <summary>
+        /// 用中心菜单
+        /// </summary>
+        public object UserCenterList { get; set; }
+
         /// <summary>
         /// 集团Logo
         /// </summary>

Edu.Model/Entity/System/RB_Menu.cs

@@ -60,5 +60,10 @@ namespace Edu.Model.Entity.System
 		/// 删除状态
 		/// </summary>
 		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int IsUserCenter { get; set; }
 	}
 }

Edu.Module.System/MenuModule.cs

@@ -86,6 +86,7 @@ namespace Edu.Module.System
                     {nameof(RB_Menu_ViewModel.MenuType),model.MenuType },
                     {nameof(RB_Menu_ViewModel.SortNum),model.SortNum },
                     {nameof(RB_Menu_ViewModel.Status),model.Status },
+                    {nameof(RB_Menu_ViewModel.IsUserCenter),model.IsUserCenter },
                 };
                 flag = menuRepository.Update(fileds, new WhereHelper(nameof(RB_Menu_ViewModel.MenuId), model.MenuId));
             }
@@ -130,14 +131,16 @@ namespace Edu.Module.System
         /// <param name="query"></param>
         /// <param name="postIds"></param>
         /// <returns></returns>
-        public List<MenuTree_ViewModel> GetPostMenuTreeModule(RB_Menu_ViewModel query, string postIds = "")
+        public List<MenuTree_ViewModel> GetPostMenuTreeModule(RB_Menu_ViewModel query, out List<RB_Menu_ViewModel> userCenterList, string postIds = "")
         {
             List<RB_Menu_ViewModel> list = new List<RB_Menu_ViewModel>();
             if (!string.IsNullOrEmpty(postIds))
             {
                 list = GetPostMenuListModule(postIds,query.MenuType);
             }
-            return GetMenuTreeModule(list);
+            userCenterList = list.Where(qitem => qitem.MenuType==query.MenuType && qitem.IsUserCenter == 1).ToList();
+            var newList= list.Where(qitem => qitem.MenuType == query.MenuType && qitem.IsUserCenter ==0).ToList();
+            return GetMenuTreeModule(newList);
         }
 
         /// <summary>

Edu.WebApi/Controllers/User/LoginController.cs

 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Edu.Cache.User;
 using Edu.Common.API;
 using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
+using Edu.Model.ViewModel.System;
 using Edu.Model.ViewModel.User;
 using Edu.Module.Public;
 using Edu.Module.System;
@@ -93,10 +95,11 @@ namespace Edu.WebApi.Controllers.User
 
                 string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
                 string erpToken = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_ERP_User_Key, erpUserInfo);
+                
                 var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
                 {
                     MenuType = accountType
-                }, postIds: model.Post_Id.ToString());
+                },out List<RB_Menu_ViewModel> userCenterList, postIds: model.Post_Id.ToString());
                 //获取功能权限列表
                 var actionList = menuModule.GetPostMenuFunctionListModule(model.Post_Id.ToString());
                 //上传配置
@@ -113,6 +116,7 @@ namespace Edu.WebApi.Controllers.User
                     Token = token,
                     ErpToken = erpToken,
                     MenuList = treeList,
+                    UserCenterList= userCenterList,
                     GroupLogo = model.GroupLogo,
                     UserIcon = model.UserIcon,
                     ApiRequestFromEnum = Common.Enum.ApiRequestFromEnum.WebAdmin,
@@ -161,8 +165,9 @@ namespace Edu.WebApi.Controllers.User
                     var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
                     {
                         MenuType = (int)userInfo.AccountType
-                    }, userInfo.PostId.ToString());
+                    }, out List<RB_Menu_ViewModel> userCenterList, userInfo.PostId.ToString());
                     userInfo.MenuList = treeList;
+                    userInfo.UserCenterList = userCenterList;
                     //获取功能权限列表
                     var actionList = menuModule.GetPostMenuFunctionListModule(userInfo.PostId.ToString());
                     userInfo.ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl });