Commit 55983cd2 authored by 黄奎's avatar 黄奎

页面修改

parent 83376389
...@@ -65,6 +65,11 @@ namespace Edu.Model.CacheModel ...@@ -65,6 +65,11 @@ namespace Edu.Model.CacheModel
/// </summary> /// </summary>
public List<MenuTree_ViewModel> MenuList { get; set; } public List<MenuTree_ViewModel> MenuList { get; set; }
/// <summary>
/// 用中心菜单
/// </summary>
public object UserCenterList { get; set; }
/// <summary> /// <summary>
/// 集团Logo /// 集团Logo
/// </summary> /// </summary>
......
...@@ -60,5 +60,10 @@ namespace Edu.Model.Entity.System ...@@ -60,5 +60,10 @@ namespace Edu.Model.Entity.System
/// 删除状态 /// 删除状态
/// </summary> /// </summary>
public DateStateEnum Status { get; set; } public DateStateEnum Status { get; set; }
/// <summary>
///
/// </summary>
public int IsUserCenter { get; set; }
} }
} }
...@@ -86,6 +86,7 @@ namespace Edu.Module.System ...@@ -86,6 +86,7 @@ namespace Edu.Module.System
{nameof(RB_Menu_ViewModel.MenuType),model.MenuType }, {nameof(RB_Menu_ViewModel.MenuType),model.MenuType },
{nameof(RB_Menu_ViewModel.SortNum),model.SortNum }, {nameof(RB_Menu_ViewModel.SortNum),model.SortNum },
{nameof(RB_Menu_ViewModel.Status),model.Status }, {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)); flag = menuRepository.Update(fileds, new WhereHelper(nameof(RB_Menu_ViewModel.MenuId), model.MenuId));
} }
...@@ -130,14 +131,16 @@ namespace Edu.Module.System ...@@ -130,14 +131,16 @@ namespace Edu.Module.System
/// <param name="query"></param> /// <param name="query"></param>
/// <param name="postIds"></param> /// <param name="postIds"></param>
/// <returns></returns> /// <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>(); List<RB_Menu_ViewModel> list = new List<RB_Menu_ViewModel>();
if (!string.IsNullOrEmpty(postIds)) if (!string.IsNullOrEmpty(postIds))
{ {
list = GetPostMenuListModule(postIds,query.MenuType); 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> /// <summary>
......
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using Edu.Cache.User; using Edu.Cache.User;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Enum.User; using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.CacheModel; using Edu.Model.CacheModel;
using Edu.Model.ViewModel.System;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Module.Public; using Edu.Module.Public;
using Edu.Module.System; using Edu.Module.System;
...@@ -93,10 +95,11 @@ namespace Edu.WebApi.Controllers.User ...@@ -93,10 +95,11 @@ namespace Edu.WebApi.Controllers.User
string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo); string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
string erpToken = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_ERP_User_Key, erpUserInfo); string erpToken = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_ERP_User_Key, erpUserInfo);
var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel() var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
{ {
MenuType = accountType 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()); var actionList = menuModule.GetPostMenuFunctionListModule(model.Post_Id.ToString());
//上传配置 //上传配置
...@@ -113,6 +116,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -113,6 +116,7 @@ namespace Edu.WebApi.Controllers.User
Token = token, Token = token,
ErpToken = erpToken, ErpToken = erpToken,
MenuList = treeList, MenuList = treeList,
UserCenterList= userCenterList,
GroupLogo = model.GroupLogo, GroupLogo = model.GroupLogo,
UserIcon = model.UserIcon, UserIcon = model.UserIcon,
ApiRequestFromEnum = Common.Enum.ApiRequestFromEnum.WebAdmin, ApiRequestFromEnum = Common.Enum.ApiRequestFromEnum.WebAdmin,
...@@ -161,8 +165,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -161,8 +165,9 @@ namespace Edu.WebApi.Controllers.User
var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel() var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
{ {
MenuType = (int)userInfo.AccountType MenuType = (int)userInfo.AccountType
}, userInfo.PostId.ToString()); }, out List<RB_Menu_ViewModel> userCenterList, userInfo.PostId.ToString());
userInfo.MenuList = treeList; userInfo.MenuList = treeList;
userInfo.UserCenterList = userCenterList;
//获取功能权限列表 //获取功能权限列表
var actionList = menuModule.GetPostMenuFunctionListModule(userInfo.PostId.ToString()); var actionList = menuModule.GetPostMenuFunctionListModule(userInfo.PostId.ToString());
userInfo.ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl }); userInfo.ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment