页面修改

Edu.Common/Enum/User/EducationEnum.cs

+using Edu.Common.Plugin;
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 学历枚举
+    /// </summary>
+    public enum EducationEnum
+    {
+        /// <summary>
+        /// 本科
+        /// </summary>
+        [EnumField("本科")]
+        BenKe = 1,
+
+        /// <summary>
+        /// 硕士
+        /// </summary>
+        [EnumField("硕士")]
+        ShuoShi = 2,
+
+        /// <summary>
+        /// 博士
+        /// </summary>
+        [EnumField("博士")]
+        BoShi = 3,
+
+        /// <summary>
+        /// 大专
+        /// </summary>
+        [EnumField("大专")]
+        DaZhuan = 4,
+
+        /// <summary>
+        /// 高中
+        /// </summary>
+        [EnumField("高中")]
+        GaoZhong = 5,
+
+        /// <summary>
+        /// 中专
+        /// </summary>
+        [EnumField("中专")]
+        ZhongZhuan = 6,
+
+        /// <summary>
+        /// 初中
+        /// </summary>
+        [EnumField("初中")]
+        ChuZhong = 7,
+
+        /// <summary>
+        /// 小学
+        /// </summary>
+        [EnumField("小学")]
+        XiaoXue = 8,
+    }
+
+    /// <summary>
+    /// 在职状态枚举
+    /// </summary>
+    public enum LeaveStatusEnum
+    {
+        /// <summary>
+        /// 在职
+        /// </summary>
+        [EnumField("在职")]
+        OnJob = 1,
+
+        /// <summary>
+        /// 兼职
+        /// </summary>
+        [EnumField("兼职")]
+        PartTime = 2,
+
+        /// <summary>
+        /// 临时工
+        /// </summary>
+        [EnumField("临时工")]
+        TemporaryWorker = 3,
+
+        /// <summary>
+        /// 离职
+        /// </summary>
+        [EnumField("离职")]
+        Departure = 4,
+    }
+}

Edu.Model/Entity/User/RB_Assist.cs

@@ -98,5 +98,45 @@ namespace Edu.Model.Entity.User
 		///  岗位编号
 		/// </summary>
 		public int Post_Id { get; set; }
+
+		/// <summary>
+		/// 省份证号码
+		/// </summary>
+		public string IDCard { get; set; }
+
+		/// <summary>
+		/// 性别(0-男,1-女)
+		/// </summary>
+		public int Sex { get; set; }
+
+		/// <summary>
+		/// 学历
+		/// </summary>
+		public EducationEnum Education { get; set; }
+
+		/// <summary>
+		/// 入职时间
+		/// </summary>
+		public DateTime EntryTime { get; set; }
+
+		/// <summary>
+		/// 地址
+		/// </summary>
+		public string Address { get; set; }
+
+		/// <summary>
+		/// 生日
+		/// </summary>
+		public DateTime BirthDate { get; set; }
+
+		/// <summary>
+		/// 在职状态
+		/// </summary>
+		public LeaveStatusEnum LeaveStatus { get; set; }
+
+		/// <summary>
+		/// 离职时间
+		/// </summary>
+		public DateTime? LeaveTime { get; set; }
 	}
 }
\ No newline at end of file

Edu.Model/Entity/User/RB_Manager.cs

@@ -76,5 +76,45 @@ namespace Edu.Model.Entity.User
 		///  岗位编号
 		/// </summary>
 		public int Post_Id { get; set; }
+
+		/// <summary>
+		/// 省份证号码
+		/// </summary>
+		public string IDCard { get; set; }
+
+		/// <summary>
+		/// 性别(0-男,1-女)
+		/// </summary>
+		public int Sex { get; set; }
+
+		/// <summary>
+		/// 学历
+		/// </summary>
+		public EducationEnum Education { get; set; }
+
+		/// <summary>
+		/// 入职时间
+		/// </summary>
+		public DateTime EntryTime { get; set; }
+
+		/// <summary>
+		/// 地址
+		/// </summary>
+		public string Address { get; set; }
+
+		/// <summary>
+		/// 生日
+		/// </summary>
+		public DateTime BirthDate { get; set; }
+
+		/// <summary>
+		/// 在职状态
+		/// </summary>
+		public LeaveStatusEnum LeaveStatus { get; set; }
+
+		/// <summary>
+		/// 离职时间
+		/// </summary>
+		public DateTime? LeaveTime { get; set; }
 	}
 }

Edu.Model/Entity/User/RB_Teacher.cs

@@ -121,5 +121,45 @@ namespace Edu.Model.Entity.User
         ///  岗位编号
         /// </summary>
         public int Post_Id { get; set; }
+
+        /// <summary>
+		/// 省份证号码
+		/// </summary>
+		public string IDCard { get; set; }
+
+        /// <summary>
+        /// 性别(0-男,1-女)
+        /// </summary>
+        public int Sex { get; set; }
+
+        /// <summary>
+        /// 学历
+        /// </summary>
+        public EducationEnum Education { get; set; }
+
+        /// <summary>
+        /// 入职时间
+        /// </summary>
+        public DateTime EntryTime { get; set; }
+
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 生日
+        /// </summary>
+        public DateTime BirthDate { get; set; }
+
+        /// <summary>
+        /// 在职状态
+        /// </summary>
+        public LeaveStatusEnum LeaveStatus { get; set; }
+
+        /// <summary>
+        /// 离职时间
+        /// </summary>
+        public DateTime? LeaveTime { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/System/RB_Role_ViewModel.cs

@@ -32,5 +32,10 @@ namespace Edu.Model.ViewModel.System
         /// 角色功能权限列表
         /// </summary>
         public List<RB_Role_FunctionPermission_ViewModel> RoleFunctionList { get; set; }
+
+        /// <summary>
+        /// 是否选中
+        /// </summary>
+        public bool IsChecked { get; set; }
     }
 }

Edu.Model/ViewModel/User/RB_Post_ViewModel.cs

 using Edu.Model.Entity.User;
+using Edu.Model.ViewModel.System;
 using System;
+using System.Collections.Generic;
 
 namespace Edu.Model.ViewModel.User
 {
@@ -50,5 +52,10 @@ namespace Edu.Model.ViewModel.User
         /// 岗位编号查询
         /// </summary>
         public string QPostIds { get; set; }
+
+        /// <summary>
+        /// 岗位角色列表
+        /// </summary>
+        public List<RB_Post_Role_ViewModel> PostRoleList { get; set; }
     }
 }

Edu.Module.System/MenuModule.cs

@@ -31,6 +31,17 @@ namespace Edu.Module.System
             return menuRepository.GetMenuListRepository(query);
         }
 
+        /// <summary>
+        /// 获取角色权限菜单列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="roleId">角色编号</param>
+        /// <returns></returns>
+        public List<RB_Menu_ViewModel> GetRoleMenuListModule(RB_Menu_ViewModel query, int roleId = 0)
+        {
+            return menuRepository.GetMenuListRepository(query, isQueryPermission: true, roleId: roleId);
+        }
+
         /// <summary>
         /// 获取菜单分页列表
         /// </summary>
@@ -106,16 +117,21 @@ namespace Edu.Module.System
         /// 获取树形菜单
         /// </summary>
         /// <param name="query"></param>
+        /// <param name="roleId">角色编号</param>
         /// <returns></returns>
-        public List<MenuTree_ViewModel> GetTreeMenuModule(RB_Menu_ViewModel query,bool isGetMenuFuncton=false)
+        public List<MenuTree_ViewModel> GetTreeMenuModule(RB_Menu_ViewModel query,int roleId=0)
         {
             List<MenuTree_ViewModel> treeList = new List<MenuTree_ViewModel>();
-            var list = GetMenuListModule(query);
-            List<RB_Menu_Function_ViewModel> functionList = new List<RB_Menu_Function_ViewModel>();
-            if (isGetMenuFuncton)
+            List<RB_Menu_ViewModel> list = new List<RB_Menu_ViewModel>();
+            if (roleId <= 0)
+            {
+                list = GetMenuListModule(query);
+            }
+            else
             {
-                functionList = GetMenuFunctionListModule(new RB_Menu_Function_ViewModel());
+                list = GetRoleMenuListModule(query, roleId: roleId);
             }
+            
             if (list != null && list.Count > 0)
             {
                 //一级菜单

Edu.Module.System/RoleModule.cs

@@ -120,6 +120,66 @@ namespace Edu.Module.System
             return roleRepository.GetEntity<RB_Role_ViewModel>(RoleId);
         }
 
+        /// <summary>
+        /// 预览角色权限
+        /// </summary>
+        /// <param name="RoleId">角色编号</param>
+        /// <returns></returns>
+        public object ViewRolePermissionModule(int RoleId)
+        {
+            var roleModel = GetRoleModule(RoleId);
+            //菜单列表
+            var menuList = menuModule.GetTreeMenuModule(new RB_Menu_ViewModel(), roleId: RoleId);
+            //获取功能权限列表
+            var actionList = functionRepository.GetMenuFunctionListRepository(new RB_Menu_Function_ViewModel() { }, isQueryNormal: true, roleId: RoleId);
+            if (menuList != null && menuList.Count > 0)
+            {
+                foreach (var item in menuList)
+                {
+                    item.MenuType = 1;
+                    if (item.SubList != null && item.SubList.Count > 0)
+                    {
+                        foreach (var subItem in item.SubList)
+                        {
+                            subItem.MenuType = 1;
+                            if (subItem.SubList != null && subItem.SubList.Count > 0)
+                            {
+                                foreach (var childItem in subItem.SubList)
+                                {
+                                    childItem.MenuType = 1;
+                                    childItem.SubList = new List<MenuTree_ViewModel>();
+                                    var subActionList = actionList?.Where(qitem => qitem.MenuId == childItem.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
+                                    if (subActionList != null && subActionList.Count > 0)
+                                    {
+                                        foreach (var actionItem in actionList)
+                                        {
+                                            var actionModel = new MenuTree_ViewModel()
+                                            {
+                                                MenuName = actionItem?.FunctionName + "【F】",
+                                                ParentId = childItem.MenuId,
+                                                MenuIcon = "",
+                                                MenuType = 2,
+                                                MenuUrl = "",
+                                                MenuId = actionItem.Id,
+                                                SubList = new List<MenuTree_ViewModel>()
+                                            };
+                                            childItem.SubList.Add(actionModel);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            var obj = new
+            {
+                RoleName = roleModel?.RoleName ?? "",
+                menuList
+            };
+            return obj;
+        }
+
         /// <summary>
         /// 修改角色状态
         /// </summary>
@@ -144,7 +204,7 @@ namespace Edu.Module.System
         public List<MenuTree_ViewModel> GetRolePermissionModule(int roleId)
         {
             //菜单列表
-            var menuList = menuModule.GetTreeMenuModule(new RB_Menu_ViewModel(), isGetMenuFuncton: true);
+            var menuList = menuModule.GetTreeMenuModule(new RB_Menu_ViewModel());
             //获取功能权限列表
             var actionList = functionRepository.GetMenuFunctionListRepository(new RB_Menu_Function_ViewModel() { }, isQueryNormal: true);
             //角色菜单权限列表

Edu.Module.User/PostModule.cs

-using Edu.Model.ViewModel.User;
+using Edu.AOP.CustomerAttribute;
+using Edu.Model.ViewModel.System;
+using Edu.Model.ViewModel.User;
+using Edu.Repository.System;
 using Edu.Repository.User;
 using System.Collections.Generic;
 using VT.FW.DB;
@@ -15,6 +18,11 @@ namespace Edu.Module.User
         /// </summary>
         private readonly RB_PostRepository postRepository = new RB_PostRepository();
 
+        /// <summary>
+        /// 岗位权限仓储层对象
+        /// </summary>
+        private readonly RB_Post_RoleRepository postRoleRepository = new RB_Post_RoleRepository();
+
         /// <summary>
         /// 获取岗位分页列表
         /// </summary>
@@ -44,7 +52,8 @@ namespace Edu.Module.User
         /// </summary>
         /// <param name="extModel"></param>
         /// <returns></returns>
-        public bool SetPostModule(RB_Post_ViewModel extModel)
+        [TransactionCallHandler]
+        public virtual bool SetPostModule(RB_Post_ViewModel extModel)
         {
             bool flag;
             if (extModel.PostId > 0)
@@ -64,6 +73,16 @@ namespace Edu.Module.User
                 extModel.PostId = newId;
                 flag = newId > 0;
             }
+            postRoleRepository.DeleteOne(new WhereHelper(nameof(RB_Post_Role_ViewModel.PostId), extModel.PostId));
+            if (extModel.PostRoleList != null && extModel.PostRoleList.Count > 0)
+            {
+                foreach (var item in extModel.PostRoleList)
+                {
+                    item.Id = 0;
+                    item.PostId = extModel.PostId;
+                    flag = postRoleRepository.Insert(item) > 0;
+                }
+            }
             return flag;
         }
 
@@ -74,7 +93,13 @@ namespace Edu.Module.User
         /// <returns></returns>
         public RB_Post_ViewModel GetPostModule(object PostId)
         {
-            return postRepository.GetEntity<RB_Post_ViewModel>(PostId);
+            var model= postRepository.GetEntity<RB_Post_ViewModel>(PostId);
+            if (model != null && model.PostId > 0)
+            {
+               var postRoleList= postRoleRepository.GetPostRoleListRepository(new RB_Post_Role_ViewModel() { PostId = model.PostId });
+                model.PostRoleList = postRoleList ?? new List<RB_Post_Role_ViewModel>();
+            }
+            return model;
         }
 
         /// <summary>

Edu.Repository/System/RB_MenuRepository.cs

@@ -14,8 +14,10 @@ namespace Edu.Repository.System
         /// 获取菜单列表
         /// </summary>
         /// <param name="query"></param>
+        /// <param name="isQueryPermission">是否只查询权限菜单</param>
+        /// <param name="roleId">角色编号</param>
         /// <returns></returns>
-        public List<RB_Menu_ViewModel> GetMenuListRepository(RB_Menu_ViewModel query)
+        public List<RB_Menu_ViewModel> GetMenuListRepository(RB_Menu_ViewModel query,bool isQueryPermission=false,int roleId=0)
         {
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
@@ -54,6 +56,10 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Menu_ViewModel.MenuType), query.MenuType);
                 }
             }
+            if (isQueryPermission && roleId>0)
+            {
+                builder.AppendFormat(" AND MenuId IN(SELECT Menu_Id FROM RB_Role_Permission WHERE Role_Id={0}) ", roleId);
+            }
             return Get<RB_Menu_ViewModel>(builder.ToString(),parameters).ToList();
         }
 

Edu.Repository/System/RB_Menu_FunctionRepository.cs

@@ -49,7 +49,7 @@ WHERE 1=1
         /// <param name="query"></param>
         /// <param name="isQueryNormal">true-正常数据,false-全部数据</param>
         /// <returns></returns>
-        public List<RB_Menu_Function_ViewModel> GetMenuFunctionListRepository(RB_Menu_Function_ViewModel query,bool isQueryNormal=false)
+        public List<RB_Menu_Function_ViewModel> GetMenuFunctionListRepository(RB_Menu_Function_ViewModel query,bool isQueryNormal=false,int roleId=0)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -61,6 +61,10 @@ WHERE 1=1
             {
                 builder.Append($" AND A.{nameof(RB_Menu_Function_ViewModel.Status)}={(int)DateStateEnum.Normal} ");
             }
+            if (roleId > 0)
+            {
+                builder.AppendFormat(@" AND A.Id IN(SELECT Action_Id FROM rb_role_functionpermission WHERE Role_Id={0} )", roleId);
+            }
             if (query != null)
             {
                 if (query.MenuId > 0)

Edu.WebApi/Controllers/Public/PublicController.cs

@@ -261,6 +261,18 @@ namespace Edu.WebApi.Controllers.Public
             return ApiResult.Success(data: extModel);
         }
 
+        /// <summary>
+        /// 权限预览
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult ViewRolePermission()
+        {
+            var RoleId = base.ParmJObj.GetInt("RoleId", 0);
+            var extModel = roleModule.ViewRolePermissionModule(RoleId);
+            return ApiResult.Success(data: extModel);
+        }
+
         /// <summary>
         /// 修改角色状态
         /// </summary>