Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

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.Common/Plugin/ConvertHelper.cs

@@ -25,6 +25,7 @@ namespace Edu.Common
                 try
                 {
                     timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd HH:mm:ss");
+                   
                 }
                 catch
                 { 
@@ -47,6 +48,10 @@ namespace Edu.Common
                 try
                 {
                     timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd");
+                    if (timeStr == "0001-01-01")
+                    {
+                        timeStr = "";
+                    }
                 }
                 catch
                 {

Edu.Common/Plugin/EnumHelper.cs

@@ -50,7 +50,7 @@ namespace Edu.Common.Plugin
             {
                 Type type = obj.GetType();
                 FieldInfo fild = type.GetField(obj.ToString());
-                if (fild.IsDefined(typeof(EnumFieldAttribute), true))
+                if (fild!=null && fild.IsDefined(typeof(EnumFieldAttribute), true))
                 {
                     EnumFieldAttribute enumField = (EnumFieldAttribute)fild.GetCustomAttribute(typeof(EnumFieldAttribute), true);
                     return enumField.Name;

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

 using Edu.Common.Enum;
+using Edu.Common.Enum.User;
 using System;
 using VT.FW.DB;
 
@@ -76,5 +77,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/MenuTree_ViewModel.cs

@@ -38,13 +38,13 @@ namespace Edu.Model.ViewModel.System
         public bool IsChecked { get; set; }
 
         /// <summary>
-        /// 子菜单列表
+        /// 菜单类型(1-系统菜单,2-功能菜单)
         /// </summary>
-        public List<MenuTree_ViewModel> SubList { get; set; }
+        public int MenuType { get; set; }
 
         /// <summary>
-        /// 功能权限列表
+        /// 子菜单列表
         /// </summary>
-        public List<RB_Menu_Function_ViewModel> FunctionSubList { get; set; }
+        public List<MenuTree_ViewModel> SubList { get; set; }
     }
 }

Edu.Model/ViewModel/System/RB_Role_ViewModel.cs

@@ -22,5 +22,20 @@ namespace Edu.Model.ViewModel.System
                 return Common.ConvertHelper.FormatTime(this.CreateDate);
             }
         }
+
+        /// <summary>
+        /// 角色菜单权限列表
+        /// </summary>
+        public List<RB_Role_Permission_ViewModel> RolePermissionList { get; set; }
+
+        /// <summary>
+        /// 角色功能权限列表
+        /// </summary>
+        public List<RB_Role_FunctionPermission_ViewModel> RoleFunctionList { get; set; }
+
+        /// <summary>
+        /// 是否选中
+        /// </summary>
+        public bool IsChecked { get; set; }
     }
 }

Edu.Model/ViewModel/User/AdminEmp_ViewModel.cs

+using Edu.Common.Enum.User;
+using System;
+
+namespace Edu.Model.ViewModel.User
+{
+    /// <summary>
+    /// 后台员工管理实体类
+    /// </summary>
+    public class AdminEmp_ViewModel
+    {
+        /// <summary>
+        /// 表主键编号
+        /// </summary>
+        public int TabKeyId { get; set; }
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string EmployeeIcon { get; set; }
+
+        /// <summary>
+        /// 员工姓名
+        /// </summary>
+        public string EmployeeName { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 部门编号
+        /// </summary>
+        public int Dept_Id { get; set; }
+
+        /// <summary>
+        /// 岗位编号
+        /// </summary>
+        public int Post_Id { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public int Sex { get; set; }
+
+        /// <summary>
+        /// 员工电话
+        /// </summary>
+        public string EmployeePhone { get; set; }
+
+        /// <summary>
+        /// 员工生日
+        /// </summary>
+        public DateTime BirthDate { get; set; }
+
+        /// <summary>
+        /// 学历
+        /// </summary>
+        public EducationEnum Education { get; set; }
+
+        /// <summary>
+        /// 在职状态
+        /// </summary>
+        public LeaveStatusEnum LeaveStatus { get; set; }
+
+        /// <summary>
+        /// 账号类型
+        /// </summary>
+        public AccountTypeEnum AccountType { get; set; }
+        
+        /// <summary>
+        /// 账号
+        /// </summary>
+        public string Account { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public int EmployeeId { get; set; }
+
+        /// <summary>
+        /// 离职时间
+        /// </summary>
+        public DateTime? LeaveTime { get; set; }
+
+        /// <summary>
+        /// 集团名称
+        /// </summary>
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DeptName { get; set; }
+
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string PostName { get; set; }
+
+        /// <summary>
+        /// 行政备注
+        /// </summary>
+        public string Remarks { get; set; }
+
+        /// <summary>
+        /// 入职时间
+        /// </summary>
+        public DateTime EntryTime { get; set; }
+
+        /// <summary>
+        /// 入职开始时间
+        /// </summary>
+        public string StartEntryTime { get; set; }
+
+        /// <summary>
+        /// 入职结束时间
+        /// </summary>
+        public string EndEntryTime { get; set; }
+
+        /// <summary>
+        /// 开始离职时间
+        /// </summary>
+        public string StartLeaveTime { get; set; }
+        
+        /// <summary>
+        /// 结束离职时间
+        /// </summary>
+        public string EndLeaveTime { get; set; }
+
+        /// <summary>
+        /// 开始生日日期
+        /// </summary>
+        public string StartBirthDate { get; set; }
+
+        /// <summary>
+        /// 结束生日日期
+        /// </summary>
+        public string EndBirthDate { 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

@@ -25,7 +25,7 @@ namespace Edu.Module.System
         private readonly RB_Role_PermissionRepository rolePermissionRepository = new RB_Role_PermissionRepository();
 
         /// <summary>
-        /// 角色数据权限仓储层对象
+        /// 角色功能权限表仓储层对象
         /// </summary>
         private readonly RB_Role_FunctionPermissionRepository roleFunctionPermissionRepository = new RB_Role_FunctionPermissionRepository();
 
@@ -67,7 +67,8 @@ namespace Edu.Module.System
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public bool SetRoleModule(RB_Role_ViewModel model)
+        [TransactionCallHandler]
+        public virtual bool SetRoleModule(RB_Role_ViewModel model)
         {
             bool flag;
             if (model.RoleId > 0)
@@ -86,6 +87,26 @@ namespace Edu.Module.System
                 model.RoleId = newId;
                 flag = newId > 0;
             }
+            rolePermissionRepository.DeleteOne(new WhereHelper(nameof(RB_Role_Permission_ViewModel.Role_Id), model.RoleId));
+            //添加角色权限
+            if (model.RolePermissionList != null && model.RolePermissionList.Count > 0)
+            {
+                foreach (var roleItem in model.RolePermissionList)
+                {
+                    roleItem.Role_Id = model.RoleId;
+                    flag= rolePermissionRepository.Insert(roleItem) > 0;
+                }
+            }
+            //添加角色功能权限
+            roleFunctionPermissionRepository.DeleteOne(new WhereHelper(nameof(RB_Role_FunctionPermission_ViewModel.Role_Id), model.RoleId));
+            if (model.RoleFunctionList != null && model.RoleFunctionList.Count > 0)
+            {
+                foreach (var roleItem in model.RoleFunctionList)
+                {
+                    roleItem.Role_Id = model.RoleId;
+                    flag = roleFunctionPermissionRepository.Insert(roleItem) > 0;
+                }
+            }
             return flag;
         }
 
@@ -99,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>
@@ -123,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);
             //角色菜单权限列表
@@ -140,20 +221,41 @@ namespace Edu.Module.System
             {
                 foreach (var item in menuList)
                 {
+                    item.MenuType = 1;
                     item.IsChecked = rolePermissionList?.Where(qitem => qitem.Menu_Id == item.MenuId)?.Count() > 0;
-                    item.FunctionSubList = actionList?.Where(qitem => qitem.MenuId == item.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
+                    //item.FunctionSubList = actionList?.Where(qitem => qitem.MenuId == item.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
                     if (item.SubList != null && item.SubList.Count > 0)
                     {
                         foreach (var subItem in item.SubList)
                         {
+                            subItem.MenuType = 1;
                             subItem.IsChecked = rolePermissionList?.Where(qitem => qitem.Menu_Id == subItem.MenuId)?.Count() > 0;
-                            subItem.FunctionSubList = actionList?.Where(qitem => qitem.MenuId == subItem.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
                             if (subItem.SubList != null && subItem.SubList.Count > 0)
                             {
                                 foreach (var childItem in subItem.SubList)
                                 {
-                                    childItem.FunctionSubList = actionList?.Where(qitem => qitem.MenuId == childItem.MenuId)?.ToList() ?? new List<RB_Menu_Function_ViewModel>();
+                                    childItem.MenuType = 1;
                                     childItem.IsChecked = rolePermissionList?.Where(qitem => qitem.Menu_Id == childItem.MenuId)?.Count() > 0;
+                                    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>()
+                                            };
+                                            actionModel.IsChecked = roleFunctionList?.Where(qitem => qitem.Action_Id == actionItem.Id)?.Count() > 0;
+                                            childItem.SubList.Add(actionModel);
+                                        }
+                                    }
                                 }
                             }
                         }

Edu.Module.User/ManagerModule.cs

@@ -47,34 +47,22 @@ namespace Edu.Module.User
         }
 
         /// <summary>
-        /// 获取管理者分页列表
+        /// 员工分页列表(管理者、讲师、助教)
         /// </summary>
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Manager_ViewModel> GetManagerPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Manager_ViewModel query)
+        public List<AdminEmp_ViewModel> GetAdminEmpPageListModule(int pageIndex, int pageSize, out long rowsCount, AdminEmp_ViewModel query)
         {
-            var list= managerRepository.GetManagerPageListRepository(pageIndex, pageSize, out rowsCount, query);
+            var list= managerRepository.GetAdminEmpPageListRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Count > 0)
             {
                 string postIds = string.Join(",", list.Where(qitem => qitem.Post_Id > 0).Select(qitem => qitem.Post_Id));
-                string deptIds = string.Join(",", list.Where(qitem => qitem.Dept_Id > 0).Select(qitem => qitem.Dept_Id));
-                List<RB_Post_ViewModel> postList = new List<RB_Post_ViewModel>();
-                List<RB_Department_ViewModel> deptList = new List<RB_Department_ViewModel>();
-                if (!string.IsNullOrEmpty(postIds))
-                {
-                    postList= postRepository.GetPostListRepository(new RB_Post_ViewModel() { QPostIds = postIds });
-                }
-                if (!string.IsNullOrEmpty(deptIds))
-                {
-                    deptList= departmentRepository.GetDepartmentListRepository(new RB_Department_ViewModel() { QDeptIds = deptIds });
-                }
                 foreach (var item in list)
                 {
-                    item.DeptName = deptList?.Where(qitem => qitem.DeptId == item.Dept_Id)?.FirstOrDefault()?.DeptName ?? "";
-                    item.PostName = postList?.Where(qitem => qitem.PostId == item.Post_Id)?.FirstOrDefault()?.PostName ?? "";
+                   
                 }
             }
             return list;

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.Repository/User/RB_ManagerRepository.cs

@@ -56,53 +56,93 @@ WHERE 1=1
         }
 
         /// <summary>
-        /// 获取管理者分页列表
+        /// 员工分页列表(管理者、讲师、助教)
         /// </summary>
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Manager_ViewModel> GetManagerPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Manager_ViewModel query)
+        public List<AdminEmp_ViewModel> GetAdminEmpPageListRepository(int pageIndex, int pageSize, out long rowsCount, AdminEmp_ViewModel query)
         {
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,B.SName,IFNULL(account.Account,'') ManagerAccount
-FROM rb_manager AS A LEFT JOIN rb_school AS B ON A.School_Id=B.SId
-     LEFT JOIN rb_account AS account ON (A.MId=account.AccountId and account.AccountType=1)
+SELECT A.* ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
+       ,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostName,'') AS PostName
+FROM
+(
+	SELECT A.MId AS TabKeyId,A.MName AS EmployeeName,A.School_Id,A.Group_Id,A.Dept_Id,A.Post_Id,IFNULL(A.Sex,0) AS Sex,A.MTel AS EmployeePhone,A.BirthDate,A.Education,A.LeaveStatus,A.LeaveTime
+        , 1 AS AccountType,IFNULL(B.Account,'') AS Account,IFNULL(B.Id,0) AS EmployeeId,A.MHead AS EmployeeIcon,A.EntryTime
+	FROM rb_manager AS A LEFT JOIN rb_account AS B ON A.MId=B.AccountId AND B.AccountType=1
+	UNION ALL
+	SELECT A.TId AS TabKeyId,A.TeacherName AS EmployeeName,A.School_Id,A.Group_Id,A.Dept_Id,A.Post_Id,IFNULL(A.Sex,0) AS Sex,A.TeacherTel AS EmployeePhone,A.BirthDate,A.Education,A.LeaveStatus,A.LeaveTime
+      ,2 AS AccountType,IFNULL(B.Account,'') AS Account,IFNULL(B.Id,0) AS EmployeeId,A.TeacherHead AS EmployeeIcon,A.EntryTime
+	FROM rb_teacher AS A LEFT JOIN rb_account AS B ON A.TId=B.AccountId AND B.AccountType=2
+	UNION ALL
+	SELECT A.AId AS TabKeyId,A.AssistName AS EmployeeName,A.School_Id,A.Group_Id,A.Dept_Id,A.Post_Id,IFNULL(A.Sex,0) AS Sex,A.AssistTel AS EmployeePhone,A.BirthDate,A.Education,A.LeaveStatus,A.LeaveTime
+      ,3 AS AccountType,IFNULL(B.Account,'') AS Account,IFNULL(B.Id,0) AS EmployeeId,A.AssistIcon AS EmployeeIcon,A.EntryTime
+	FROM rb_assist AS A LEFT JOIN rb_account AS B ON A.AId=B.AccountId AND B.AccountType=3
+) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
+       LEFT JOIN rb_school AS s ON A.School_Id=s.SId
+       LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId
+       LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId
 WHERE 1=1 
 ");
             if (query != null)
             {
-                if (!string.IsNullOrWhiteSpace(query.MName))
+                if (!string.IsNullOrWhiteSpace(query.EmployeeName))
                 {
-                    builder.AppendFormat(" AND a.{0} LIKE @MName ", nameof(RB_Manager_ViewModel.MName));
-                    parameters.Add("MName", "%" + query.MName.Trim() + "%");
-                }
-                if (!string.IsNullOrWhiteSpace(query.MTel))
-                {
-                    builder.AppendFormat(" AND a.{0} LIKE @MTel ", nameof(RB_Manager_ViewModel.MTel));
-                    parameters.Add("MTel", "%" + query.MTel.Trim() + "%");
+                    builder.AppendFormat(" AND (a.{0} LIKE @MName OR A.Account LIKE @MName) ", nameof(AdminEmp_ViewModel.EmployeeName));
+                    parameters.Add("MName", "%" + query.EmployeeName.Trim() + "%");
                 }
                 if (query.School_Id > 0)
                 {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.School_Id), query.School_Id);
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(AdminEmp_ViewModel.School_Id), query.School_Id);
                 }
                 if (query.Group_Id > 0)
                 {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.Group_Id), query.Group_Id);
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(AdminEmp_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.MId > 0)
+                if (query.Dept_Id > 0)
                 {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.MId), query.MId);
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(AdminEmp_ViewModel.Dept_Id), query.Dept_Id);
                 }
-                if (query.Status >= 0)
+                if (query.Post_Id > 0)
                 {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.Status), (int)query.Status);
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(AdminEmp_ViewModel.Post_Id), query.Post_Id);
+                }
+                if (query.LeaveStatus >= 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(AdminEmp_ViewModel.LeaveStatus), (int)query.LeaveStatus);
+                }
+                if (!string.IsNullOrEmpty(query.StartEntryTime))
+                {
+                    builder.AppendFormat(" AND a.{0}>='{1}' ", nameof(AdminEmp_ViewModel.EntryTime), query.StartEntryTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndEntryTime))
+                {
+                    builder.AppendFormat(" AND a.{0}<='{1} 23:59:59' ", nameof(AdminEmp_ViewModel.EntryTime), query.EndEntryTime);
+                }
+                if (!string.IsNullOrEmpty(query.StartLeaveTime))
+                {
+                    builder.AppendFormat(" AND a.{0}>='{1}' ", nameof(AdminEmp_ViewModel.LeaveTime), query.StartLeaveTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndLeaveTime))
+                {
+                    builder.AppendFormat(" AND a.{0}<='{1} 23:59:59' ", nameof(AdminEmp_ViewModel.LeaveTime), query.EndLeaveTime);
+                }
+                if (!string.IsNullOrEmpty(query.StartBirthDate))
+                { 
+                
+                }
+
+                if (!string.IsNullOrEmpty(query.EndBirthDate))
+                { 
+                
                 }
             }
-            return GetPage<RB_Manager_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+            return GetPage<AdminEmp_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
     }
 }
\ No newline at end of file

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>
@@ -388,7 +400,7 @@ namespace Edu.WebApi.Controllers.Public
         [HttpPost]
         public ApiResult GetRolePermission()
         {
-            var roleId = base.ParmJObj.GetInt("Role_Id");
+            var roleId = base.ParmJObj.GetInt("RoleId");
             var list = roleModule.GetRolePermissionModule(roleId);
             return ApiResult.Success(data: list);
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -623,23 +623,27 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult GetManagerPageList()
         {
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Manager_ViewModel>(RequestParm.Msg.ToString());
+            var query = Common.Plugin.JsonHelper.DeserializeObject<AdminEmp_ViewModel>(RequestParm.Msg.ToString());
             query.Group_Id = base.UserInfo.Group_Id;
             //query.School_Id = base.UserInfo.School_Id;
-            var list = managerModule.GetManagerPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
-            foreach (var item in list)
-            {
-                if (item.CreateBy > 0)
-                {
-                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
-                }
-                if (item.UpdateBy > 0)
-                {
-                    item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "";
-                }
-            }
+            var list = managerModule.GetAdminEmpPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.Count = rowsCount;
-            pageModel.PageData = list;
+            pageModel.PageData = list.Select(qitem => new
+            {
+                qitem.TabKeyId,
+                qitem.EmployeeIcon,
+                qitem.EmployeeName,
+                qitem.SchoolName,
+                qitem.DeptName,
+                qitem.PostName,
+                Sex = qitem.Sex == 0 ? "男" : "女",
+                BirthDate = Common.ConvertHelper.FormatDate(qitem.BirthDate),
+                Education = qitem.Education.ToName(),
+                LeaveStatus=qitem.LeaveStatus.ToName(),
+                qitem.EmployeeId,
+                qitem.Account,
+                qitem.AccountType,
+            });
             return ApiResult.Success(data: pageModel);
         }