角色管理调整好了

Controllers/Base/SysMenuController.cs

@@ -90,15 +90,15 @@ namespace Controllers
         /// </summary>
         /// <param name="roleId"></param>
         /// <returns></returns>
-        [HttpGet("roleMenuTreeselect/{roleId}")]
-        public IActionResult RoleMenuTreeselect(int roleId)
+        [HttpGet("/v1/skb/sysServer/menu/getRoleTree")]
+        public IActionResult RoleMenuTreeselect([FromQuery] RoleMenuQueryDto menu)
         {
-            long userId = HttpContext.GetUId();
-            var menus = sysMenuService.SelectMenuList(new MenuQueryDto(), userId);
-            var checkedKeys = sysRoleService.SelectUserRoleMenus(roleId);
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            var menus = sysMenuService.SelectMenuList(new MenuQueryDto(), loginUser.userId);
+            var setCheckedKeys = sysRoleService.SelectUserRoleMenus(menu.roleId);
             return SUCCESS(new
             {
-                checkedKeys,
+                setCheckedKeys,
                 menus = sysMenuService.BuildMenuTreeSelect(menus),
             });
         }
@@ -109,7 +109,7 @@ namespace Controllers
         {
             long userId = HttpContext.GetUId();
             var menus = sysMenuService.SelectMenuList(new MenuQueryDto(), userId);
-            return SUCCESS(sysMenuService.BuildMenuTreeSelect(menus));
+            return SUCCESS(sysMenuService.BuildLeftMenuTreeSelect(menus));
         }
 
         /// <summary>

Controllers/Base/SysRoleController.cs

@@ -12,6 +12,7 @@ using Middleware;
 using Model;
 using Model.Base;
 using Services;
+using Util;
 
 namespace Controllers
 {
@@ -19,8 +20,6 @@ namespace Controllers
     /// 角色信息
     /// </summary>
     [Verify]
-    [Route("system/role")]
-    [ApiExplorerSettings(GroupName = "sys")]
     public class SysRoleController : BaseController
     {
         private readonly ISysRoleService sysRoleService;
@@ -38,8 +37,7 @@ namespace Controllers
         /// 获取系统角色管理
         /// </summary>
         /// <returns></returns>
-        [ActionPermissionFilter(Permission = "system:role:list")]
-        [HttpGet("list")]
+        [HttpGet("/v1/skb/sysServer/role/page")]
         public IActionResult List([FromQuery] SysRole role, [FromQuery] PagerInfo pager)
         {
             var list = sysRoleService.SelectRoleList(role, pager);
@@ -75,23 +73,21 @@ namespace Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPost]
-        [ActionPermissionFilter(Permission = "system:role:add")]
-        [Log(Title = "角色管理", BusinessType = BusinessType.INSERT)]
-        [Route("edit")]
+        [HttpPost("/v1/skb/sysServer/role/add")]
         public IActionResult RoleAdd([FromBody] SysRoleDto dto)
         {
-            if (dto == null) return ToResponse(ApiResult.Error(101, "请求参数错误"));
             SysRole sysRoleDto = dto.Adapt<SysRole>();
             if (UserConstants.NOT_UNIQUE.Equals(sysRoleService.CheckRoleKeyUnique(sysRoleDto)))
             {
-                return ToResponse(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.RoleName}'失败，角色权限已存在"));
+                return ToResponse(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.roleName}'失败，角色权限已存在"));
             }
-
-            sysRoleDto.CreateBy = HttpContext.GetName();
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            sysRoleDto.CreateBy = loginUser.username;
+            sysRoleDto.UpdateBy = loginUser.username;
+            sysRoleDto.DelFlag = "0";
             long roleId = sysRoleService.InsertRole(sysRoleDto);
 
-            return ToResponse(roleId);
+            return SUCCESS(roleId);
         }
 
         /// <summary>
@@ -99,33 +95,31 @@ namespace Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPut]
-        [ActionPermissionFilter(Permission = "system:role:edit")]
-        [Log(Title = "角色管理", BusinessType = BusinessType.UPDATE)]
-        [Route("edit")]
+        [HttpPut("/v1/skb/sysServer/role/update")]
         public IActionResult RoleEdit([FromBody] SysRoleDto dto)
         {
-            if (dto == null || dto.RoleId <= 0 || string.IsNullOrEmpty(dto.RoleKey))
+            if (dto == null || dto.roleId <= 0)
             {
                 return ToResponse(ApiResult.Error(101, "请求参数错误"));
             }
             SysRole sysRoleDto = dto.Adapt<SysRole>();
             sysRoleService.CheckRoleAllowed(sysRoleDto);
-            var info = sysRoleService.SelectRoleById(sysRoleDto.RoleId);
-            if (info != null && info.RoleCode != sysRoleDto.RoleCode)
+            var info = sysRoleService.SelectRoleById(sysRoleDto.roleId);
+            if (info != null && info.roleCode != sysRoleDto.roleCode)
             {
                 if (UserConstants.NOT_UNIQUE.Equals(sysRoleService.CheckRoleKeyUnique(sysRoleDto)))
                 {
-                    return ToResponse(ApiResult.Error($"编辑角色'{sysRoleDto.RoleName}'失败，角色权限已存在"));
+                    return ToResponse(ApiResult.Error($"编辑角色'{sysRoleDto.roleName}'失败，角色权限已存在"));
                 }
             }
-            sysRoleDto.UpdateBy = HttpContext.GetName();
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            sysRoleDto.UpdateBy = loginUser.username;
             int upResult = sysRoleService.UpdateRole(sysRoleDto);
             if (upResult > 0)
             {
                 return SUCCESS(upResult);
             }
-            return ToResponse(ApiResult.Error($"修改角色'{sysRoleDto.RoleName}'失败，请联系管理员"));
+            return SUCCESS(ApiResult.Error($"修改角色'{sysRoleDto.roleName}'失败，请联系管理员"));
         }
 
         /// <summary>
@@ -133,14 +127,12 @@ namespace Controllers
         /// </summary>
         /// <param name="sysRoleDto"></param>
         /// <returns></returns>
-        [HttpPut("dataScope")]
-        [ActionPermissionFilter(Permission = "system:role:authorize")]
-        [Log(Title = "角色管理", BusinessType = BusinessType.UPDATE)]
+        [HttpPut("/v1/skb/sysServer/role/menu")]
         public IActionResult DataScope([FromBody] SysRoleDto sysRoleDto)
         {
-            if (sysRoleDto == null || sysRoleDto.RoleId <= 0) return ToResponse(ApiResult.Error(101, "请求参数错误"));
+            if (sysRoleDto == null || sysRoleDto.roleId <= 0) return ToResponse(ApiResult.Error(101, "请求参数错误"));
             SysRole sysRole = sysRoleDto.Adapt<SysRole>();
-            sysRoleDto.CreateBy = HttpContext.GetName();
+            sysRoleDto.createBy = HttpContext.GetName();
             sysRoleService.CheckRoleAllowed(sysRole);
 
             bool result = sysRoleService.AuthDataScope(sysRoleDto);
@@ -153,15 +145,13 @@ namespace Controllers
         /// </summary>
         /// <param name="roleId"></param>
         /// <returns></returns>
-        [HttpDelete("{roleId}")]
-        [Log(Title = "角色管理", BusinessType = BusinessType.DELETE)]
-        [ActionPermissionFilter(Permission = "system:role:remove")]
-        public IActionResult Remove(string roleId)
+        [HttpDelete("/v1/skb/sysServer/role/removeById/{id}")]
+        public IActionResult Remove(int id)
         {
-            long[] roleIds = Tools.SpitLongArrary(roleId);
+            long[] roleIds = { id };
             int result = sysRoleService.DeleteRoleByRoleId(roleIds);
 
-            return ToResponse(result);
+            return SUCCESS(result);
         }
 
         /// <summary>

Filters/GlobalActionMonitor.cs

@@ -91,11 +91,16 @@ namespace Middleware
                                             }
                                             else if (ParameterType == "Int64[]")
                                             {
-                                                value = Tools.SpitLongArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", ""), ',');
+                                                value = Tools.SpitLongArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"'), ',');
                                             }
                                             else if (ParameterType == "Int32[]")
                                             {
-                                                value = Tools.SpitIntArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", ""), ',');
+                                                value = Tools.SpitIntArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"'), ',');
+                                            }
+                                            else if (ParameterType == "List`1")
+                                            {
+                                                string val = Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", "").Trim('"');
+                                                value = Tools.SpitLongArrary(val, ',').ToList();
                                             }
                                             if(value.ToString() == "-1") value = -1;
                                             if(value.ToString() == "[]") value = "";

Model/Base/SysRole.cs

@@ -10,43 +10,43 @@ namespace Model
         /// <summary>
         /// 角色ID
         /// </summary>
-        [SugarColumn(ColumnDescription = "角色ID", ColumnName = "role_id")]
-        public long RoleId { get; set; }
+        [SugarColumn(ColumnDescription = "角色ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "role_id")]
+        public long roleId { get; set; }
 
 
         /// <summary>
         /// 角色名称
         /// </summary>
         [SugarColumn(ColumnDescription = "角色名称", Length = 64, ColumnName = "role_name")]
-        public string RoleName { get; set; }
+        public string? roleName { get; set; }
 
 
         /// <summary>
         /// 角色编码
         /// </summary>
         [SugarColumn(ColumnDescription = "角色编码", Length = 64, ColumnName = "role_code")]
-        public string RoleCode { get; set; }
+        public string? roleCode { get; set; }
 
 
         /// <summary>
         /// 角色描述
         /// </summary>
         [SugarColumn(ColumnDescription = "角色描述", Length = 255, ColumnName = "role_desc")]
-        public string RoleDesc { get; set; }
+        public string? roleDesc { get; set; }
 
 
         /// <summary>
         /// 创建人
         /// </summary>
         [SugarColumn(ColumnDescription = "创建人", Length = 64, ColumnName = "create_by")]
-        public string CreateBy { get; set; }
+        public string? CreateBy { get; set; }
 
 
         /// <summary>
         /// 修改人
         /// </summary>
         [SugarColumn(ColumnDescription = "修改人", Length = 64, ColumnName = "update_by")]
-        public string UpdateBy { get; set; }
+        public string? UpdateBy { get; set; }
 
 
         /// <summary>
@@ -67,26 +67,26 @@ namespace Model
         /// 删除标记，0未删除，1已删除
         /// </summary>
         [SugarColumn(ColumnDescription = "删除标记，0未删除，1已删除", Length = 1, ColumnName = "del_flag")]
-        public string DelFlag { get; set; }
+        public string? DelFlag { get; set; }
 
 
         /// <summary>
         /// 用户个数
         /// </summary>
         [SugarColumn(IsIgnore = true)]
-        public int UserNum { get; set; }
+        public int userNum { get; set; }
 
 
         public SysRole() { }
 
         public SysRole(long roleId)
         {
-            RoleId = roleId;
+            roleId = roleId;
         }
 
         public bool IsAdmin()
         {
-            return IsAdmin(RoleId);
+            return IsAdmin(roleId);
         }
 
         public static bool IsAdmin(long roleId)

Model/Dto/Base/MenuDto.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using MessagePack.Formatters;
 using MiniExcelLibs.Attributes;
 
 namespace Dto
@@ -93,4 +94,9 @@ namespace Dto
         //     }
         // }
     }
-}
+
+    public class RoleMenuQueryDto
+    {
+        public int roleId { get; set; }
+    }
+}

Model/Dto/Base/SysRoleDto.cs

@@ -4,24 +4,32 @@ namespace Dto
 {
     public class SysRoleDto : SysBase
     {
-        public long RoleId { get; set; }
+        public long roleId { get; set; }
         /// <summary>
         /// 要添加的菜单集合
         /// </summary>
-        public List<long> MenuIds { get; set; } = new List<long>();
-        public string RoleName { get; set; }
-        public string RoleKey { get; set; }
-        public int RoleSort { get; set; }
-        public int Status { get; set; }
-        public int DataScope { get; set; }
-        public int[] DeptIds { get; set; }
-        public string CreateBy { get; set; }
+        public List<long> menuIds { get; set; } = new List<long>();
+        public string? roleName { get; set; }
+        public string? roleCode { get; set; }
+        public string? roleDesc { get; set; }
+        public string? roleKey { get; set; }
+        public int roleSort { get; set; }
+        public int dataScope { get; set; }
+        // public int[] deptIds { get; set; }
+        public string? createBy { get; set; }
         /// <summary>
         /// 减少菜单集合
         /// </summary>
-        public List<long> DelMenuIds { get; set; } = new List<long>();
-        public bool MenuCheckStrictly { get; set; }
-        public bool DeptCheckStrictly { get; set; }
+        public List<long> delMenuIds { get; set; } = new List<long>();
+        public bool menuCheckStrictly { get; set; }
+        public bool deptCheckStrictly { get; set; }
+
+    }
+
+    public class SysRoleSetDto
+    {
+        public long roleId { get; set; }
+        public List<long> menuIds { get; set; } = new List<long>();
 
     }
 }

Model/Vo/Base/LeftMenuVo.cs

@@ -0,0 +1,75 @@
+using Model;
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// Treeselect树结构实体类
+    /// </summary>
+    public class LeftMenuVo
+    {
+        /// <summary>
+        /// 节点Id
+        /// </summary>
+        public long Id { get; set; }
+        /// <summary>
+        /// 节点名称
+        /// </summary>
+        public string Name { get; set; }
+        public long ParentId { get; set; }
+        public string MenuType { get; set; }
+        public string Path { get; set; }
+        public int SortOrder { get; set; }
+        public TreeSelectMeta meta { get; set; }
+        public List<string> Permission { get; set; }
+
+        public LeftMenuVo() { }
+
+        public LeftMenuVo(SysMenu menu)
+        {
+            Id = menu.menuId;
+            Name = menu.name;
+            ParentId = menu.parentId;
+            MenuType = menu.menuType;
+            Path = menu.path;
+            SortOrder = menu.sortOrder;
+            meta = new TreeSelectMeta();
+            meta.title = menu.name;
+            meta.enName = menu.enName;
+            meta.icon = menu.icon;
+            Permission = new List<string>();
+
+            List<LeftMenuVo> child = new List<LeftMenuVo>();
+            foreach (var item in menu.children)
+            {
+                if(item.menuType == "0")
+                {
+                    child.Add(new LeftMenuVo(item));
+                }
+                else
+                {
+                    Permission.Add(item.permission);
+                }
+            }
+
+            Children = child;
+        }
+
+        public LeftMenuVo(SysDept dept)
+        {
+            Id = dept.deptId;
+            Name = dept.name;
+
+            List<LeftMenuVo> child = new List<LeftMenuVo>();
+            foreach (var item in dept.children)
+            {
+                child.Add(new LeftMenuVo(item));
+            }
+
+            Children = child;
+        }
+
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public List<LeftMenuVo> Children { get; set; }
+    }
+}

Services/Base/IService/ISysMenuService.cs

@@ -37,6 +37,8 @@ namespace Services
 
         List<TreeSelectVo> BuildMenuTreeSelect(List<SysMenu> menus);
 
+        List<LeftMenuVo> BuildLeftMenuTreeSelect(List<SysMenu> menus);
+
         List<SysMenu> SelectTreeMenuListByRoles(MenuQueryDto menu, List<long> roles);
         List<RoleMenuExportDto> SelectRoleMenuListByRole(MenuQueryDto menu, int roleId);
     }

Services/Base/SysMenuService.cs

@@ -197,7 +197,7 @@ namespace Services
             var menus = Context.Queryable<SysMenu, SysRoleMenu, SysUserRole, SysRole>((m, rm, ur, r) => new JoinQueryInfos(
                 JoinType.Left, m.menuId == rm.MenuId,
                 JoinType.Left, rm.RoleId == ur.RoleId,
-                JoinType.Left, ur.RoleId == r.RoleId
+                JoinType.Left, ur.RoleId == r.roleId
                 ))
                 .WithCache(60 * 10)
                 .Where((m, rm, ur, r) => m.DelFlag == "0" && ur.UserId == userId)
@@ -481,6 +481,16 @@ namespace Services
             }
             return treeMenuVos;
         }
+        public List<LeftMenuVo> BuildLeftMenuTreeSelect(List<SysMenu> menus)
+        {
+            List<SysMenu> menuTrees = BuildMenuTree(menus);
+            List<LeftMenuVo> treeMenuVos = new List<LeftMenuVo>();
+            foreach (var item in menuTrees)
+            {
+                treeMenuVos.Add(new LeftMenuVo(item));
+            }
+            return treeMenuVos;
+        }
 
         /// <summary>
         /// 获取路由名称

Services/Base/SysRoleService.cs

@@ -39,15 +39,15 @@ namespace Services
         {
             var exp = Expressionable.Create<SysRole>();
             exp.And(role => role.DelFlag == "0");
-            exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleName), role => role.RoleName.Contains(sysRole.RoleName));
-            exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleCode), role => role.RoleCode == sysRole.RoleCode);
+            exp.AndIF(!string.IsNullOrEmpty(sysRole.roleName), role => role.roleName.Contains(sysRole.roleName));
+            exp.AndIF(!string.IsNullOrEmpty(sysRole.roleCode), role => role.roleCode == sysRole.roleCode);
 
             var query = Queryable()
                 .Where(exp.ToExpression())
-                .OrderBy(x => x.RoleId)
+                .OrderBy(x => x.roleId)
                 .Select((role) => new SysRole
                 {
-                    UserNum = SqlFunc.Subqueryable<SysUserRole>().Where(f => f.RoleId == role.RoleId).Count()
+                    userNum = SqlFunc.Subqueryable<SysUserRole>().Where(f => f.RoleId == role.roleId).Count()
                 }, true);
 
             return query.ToPage(pager);
@@ -61,7 +61,7 @@ namespace Services
         {
             return Queryable()
                 .Where(role => role.DelFlag == "0")
-                .OrderBy(role => role.RoleId)
+                .OrderBy(role => role.roleId)
                 .ToList();
         }
 
@@ -75,7 +75,7 @@ namespace Services
             return Queryable()
                 .Where(role => role.DelFlag == "0")
                 .Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == userId).Any())
-                .OrderBy(role => role.RoleId)
+                .OrderBy(role => role.roleId)
                 .ToList();
         }
 
@@ -102,7 +102,7 @@ namespace Services
                 SysRole role = SelectRoleById(item);
                 if (SysUserRoleService.CountUserRoleByRoleId(item) > 0)
                 {
-                    throw new CustomException($"{role.RoleName}已分配,不能删除");
+                    throw new CustomException($"{role.roleName}已分配,不能删除");
                 }
             }
             return Delete(roleIds);
@@ -115,7 +115,7 @@ namespace Services
         /// <returns></returns>
         public int UpdateRoleStatus(SysRole roleDto)
         {
-            return Update(roleDto, it => new { it.DelFlag }, f => f.RoleId == roleDto.RoleId);
+            return Update(roleDto, it => new { it.DelFlag }, f => f.roleId == roleDto.roleId);
         }
 
         /// <summary>
@@ -125,9 +125,9 @@ namespace Services
         /// <returns></returns>
         public string CheckRoleKeyUnique(SysRole sysRole)
         {
-            long roleId = 0 == sysRole.RoleId ? -1L : sysRole.RoleId;
-            SysRole info = GetFirst(it => it.RoleCode == sysRole.RoleCode);
-            if (info != null && info.RoleId != roleId)
+            long roleId = 0 == sysRole.roleId ? -1L : sysRole.roleId;
+            SysRole info = GetFirst(it => it.roleCode == sysRole.roleCode);
+            if (info != null && info.roleId != roleId)
             {
                 return UserConstants.NOT_UNIQUE;
             }
@@ -140,7 +140,7 @@ namespace Services
         /// <param name="role"></param>
         public void CheckRoleAllowed(SysRole role)
         {
-            if (IsRoleAdmin(role.RoleId))
+            if (IsRoleAdmin(role.roleId))
             {
                 throw new CustomException("不允许操作超级管理员角色");
             }
@@ -154,11 +154,11 @@ namespace Services
         public long InsertRole(SysRole sysRole)
         {
             sysRole.CreateTime = DateTime.Now;
-            sysRole.RoleId = InsertReturnBigIdentity(sysRole);
+            sysRole.roleId = InsertReturnBigIdentity(sysRole);
             //插入角色部门数据
             DeptService.InsertRoleDepts(sysRole);
 
-            return sysRole.RoleId;
+            return sysRole.roleId;
         }
 
         /// <summary>
@@ -181,10 +181,10 @@ namespace Services
             return UseTran2(() =>
             {
                 //删除角色菜单
-                //DeleteRoleMenuByRoleId(sysRoleDto.RoleId);
+                //DeleteRoleMenuByRoleId(sysRoleDto.roleId);
                 //InsertRoleMenu(sysRoleDto);
-                var oldMenus = SelectUserRoleMenus(sysRoleDto.RoleId);
-                var newMenus = sysRoleDto.MenuIds;
+                var oldMenus = SelectUserRoleMenus(sysRoleDto.roleId);
+                var newMenus = sysRoleDto.menuIds;
 
                 //并集菜单
                 var arr_c = oldMenus.Intersect(newMenus).ToArray();
@@ -193,9 +193,9 @@ namespace Services
                 //获取增量
                 var addMenuIds = newMenus.Where(c => !arr_c.Contains(c)).ToArray();
 
-                RoleMenuService.DeleteRoleMenuByRoleIdMenuIds(sysRoleDto.RoleId, delMenuIds);
-                sysRoleDto.MenuIds = addMenuIds.ToList();
-                sysRoleDto.DelMenuIds= delMenuIds.ToList();
+                RoleMenuService.DeleteRoleMenuByRoleIdMenuIds(sysRoleDto.roleId, delMenuIds);
+                sysRoleDto.menuIds = addMenuIds.ToList();
+                sysRoleDto.delMenuIds= delMenuIds.ToList();
                 InsertRoleMenu(sysRoleDto);
                 Console.WriteLine($"减少了{delMenuIds.Length},增加了{addMenuIds.Length}菜单");
             });
@@ -214,12 +214,12 @@ namespace Services
             int rows = 1;
             // 新增用户与角色管理
             List<SysRoleMenu> sysRoleMenus = new();
-            foreach (var item in sysRoleDto.MenuIds)
+            foreach (var item in sysRoleDto.menuIds)
             {
                 SysRoleMenu rm = new()
                 {
                     MenuId = item,
-                    RoleId = sysRoleDto.RoleId,
+                    RoleId = sysRoleDto.roleId,
                 };
                 sysRoleMenus.Add(rm);
             }
@@ -251,9 +251,9 @@ namespace Services
         /// <returns></returns>
         public bool IsRoleAdmin(long roleid)
         {
-            var roleInfo = GetFirst(x => x.RoleId == roleid);
+            var roleInfo = GetFirst(x => x.roleId == roleid) ?? new SysRole();
 
-            return roleInfo.RoleCode == GlobalConstant.AdminRole;
+            return roleInfo.roleCode == GlobalConstant.AdminRole;
         }
 
         /// <summary>
@@ -288,8 +288,8 @@ namespace Services
         public List<SysRole> SelectUserRoleListByUserId(long userId)
         {
             return Context.Queryable<SysUserRole>()
-                .LeftJoin<SysRole>((ur, r) => ur.RoleId == r.RoleId)
-                .Where((ur, r) => ur.UserId == userId && r.RoleId > 0)
+                .LeftJoin<SysRole>((ur, r) => ur.RoleId == r.roleId)
+                .Where((ur, r) => ur.UserId == userId && r.roleId > 0)
                 .WithCache(60 * 10)
                 .Select((ur, r) => r)
                 .ToList();
@@ -304,7 +304,7 @@ namespace Services
         {
             var list = SelectUserRoleListByUserId(userId).Where(f => f.DelFlag == "0");
 
-            return list.Select(x => x.RoleId).ToList();
+            return list.Select(x => x.roleId).ToList();
         }
 
         /// <summary>
@@ -315,7 +315,7 @@ namespace Services
         public List<string> SelectUserRoleKeys(long userId)
         {
             var list = SelectUserRoleListByUserId(userId);
-            return list.Select(x => x.RoleCode).ToList();
+            return list.Select(x => x.roleCode).ToList();
         }
 
         /// <summary>
@@ -326,7 +326,7 @@ namespace Services
         public List<string> SelectUserRoleNames(long userId)
         {
             var list = SelectUserRoleListByUserId(userId);
-            return list.Select(x => x.RoleName).ToList();
+            return list.Select(x => x.roleName).ToList();
         }
         #endregion
 
@@ -337,14 +337,15 @@ namespace Services
         /// <returns></returns>
         public int UpdateRole(SysRole sysRole)
         {
+            sysRole.UpdateTime = DateTime.Now;
             var result = UseTran(() =>
             {
                 //修改角色信息
                 UpdateSysRole(sysRole);
                 //删除角色与部门管理
-                DeptService.DeleteRoleDeptByRoleId(sysRole.RoleId);
-                //插入角色部门数据
-                DeptService.InsertRoleDepts(sysRole);
+                // DeptService.DeleteRoleDeptByRoleId(sysRole.roleId);
+                // //插入角色部门数据
+                // DeptService.InsertRoleDepts(sysRole);
             });
 
             return result.IsSuccess ? 1 : 0;
@@ -362,11 +363,11 @@ namespace Services
 
             return db.Updateable<SysRole>()
             .SetColumns(it => it.UpdateTime == sysRole.UpdateTime)
-            .SetColumns(it => it.RoleDesc == sysRole.RoleDesc)
+            .SetColumns(it => it.roleDesc == sysRole.roleDesc)
             .SetColumns(it => it.UpdateBy == sysRole.UpdateBy)
-            .SetColumnsIF(!string.IsNullOrEmpty(sysRole.RoleName), it => it.RoleName == sysRole.RoleName)
-            .SetColumnsIF(!string.IsNullOrEmpty(sysRole.RoleCode), it => it.RoleCode == sysRole.RoleCode)
-            .Where(it => it.RoleId == sysRole.RoleId)
+            .SetColumnsIF(!string.IsNullOrEmpty(sysRole.roleName), it => it.roleName == sysRole.roleName)
+            .SetColumnsIF(!string.IsNullOrEmpty(sysRole.roleCode), it => it.roleCode == sysRole.roleCode)
+            .Where(it => it.roleId == sysRole.roleId)
             .ExecuteCommand();
         }
     }

Services/Base/SysUserService.cs

@@ -56,7 +56,7 @@ namespace Services
             foreach(SysUser sub in result.Records)
             {
                 List<long> userRoles = UserRoleService.GetList(m => m.UserId == sub.userId).Select(m => m.RoleId).ToList();
-                sub.RoleList = RoleService.GetList(m => userRoles.Contains(m.RoleId));
+                sub.RoleList = RoleService.GetList(m => userRoles.Contains(m.roleId));
 
                 List<long> userPost = UserPostService.GetList(m => m.UserId == sub.userId).Select(m => m.PostId).ToList();
                 sub.PostList = PostService.GetList(m => userPost.Contains(m.postId));