Browse Source

菜单管理调整好了

lcl 9 months ago
parent
commit
b89808ab4a

+ 1 - 1
Base/GlobalConstant.cs

@@ -12,7 +12,7 @@
         /// <summary>
         /// 管理员角色
         /// </summary>
-        public static string AdminRole = "admin";
+        public static string AdminRole = "ROLE_ADMIN";
         /// <summary>
         /// 开发版本API映射路径
         /// </summary>

+ 30 - 30
Controllers/Base/SysMenuController.cs

@@ -9,7 +9,9 @@ using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using Middleware;
 using Model;
+using Model.Base;
 using Services;
+using Util;
 
 namespace Controllers
 {
@@ -37,10 +39,11 @@ namespace Controllers
         /// 获取菜单树列表
         /// </summary>
         /// <returns></returns>
-        [HttpGet("treelist")]
+        [HttpGet("/v1/skb/sysServer/menu/tree")]
         public IActionResult TreeMenuList([FromQuery] MenuQueryDto menu)
         {
-            long userId = HttpContext.GetUId();
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            long userId = loginUser.userId;
             return SUCCESS(sysMenuService.SelectTreeMenuList(menu, userId), "yyyy-MM-dd HH:mm:ss");
         }
 
@@ -114,9 +117,7 @@ namespace Controllers
         /// </summary>
         /// <param name="menuDto"></param>
         /// <returns></returns>
-        [HttpPost("edit")]
-        [Log(Title = "菜单管理", BusinessType = BusinessType.UPDATE)]
-        [ActionPermissionFilter(Permission = "system:menu:edit")]
+        [HttpPut("/v1/skb/sysServer/menu/update")]
         public IActionResult MenuEdit([FromBody] MenuDto menuDto)
         {
             if (menuDto == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
@@ -130,18 +131,19 @@ namespace Controllers
                 .NameMatchingStrategy(NameMatchingStrategy.IgnoreCase);//忽略字段名称的大小写;//忽略除以上配置的所有字段
 
             var modal = menuDto.Adapt<SysMenu>(config).ToUpdate(HttpContext);
-            if (modal.MenuType == "3" && !modal.Path.StartsWith("http"))
+            if (modal.menuType == "3" && !modal.path.StartsWith("http"))
             {
-                return ToResponse(ApiResult.Error($"修改菜单'{modal.Name}'失败,地址必须以http(s)://开头"));
+                return ToResponse(ApiResult.Error($"修改菜单'{modal.name}'失败,地址必须以http(s)://开头"));
             }
-            if (modal.MenuId.Equals(modal.ParentId))
+            if (modal.menuId.Equals(modal.parentId))
             {
-                return ToResponse(ApiResult.Error($"修改菜单'{modal.Name}'失败,上级菜单不能选择自己"));
+                return ToResponse(ApiResult.Error($"修改菜单'{modal.name}'失败,上级菜单不能选择自己"));
             }
-            modal.UpdateBy = HttpContext.GetName();
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            modal.UpdateBy = loginUser.username;
             long result = sysMenuService.EditMenu(modal);
 
-            return ToResponse(result);
+            return SUCCESS(result);
         }
 
         /// <summary>
@@ -149,9 +151,7 @@ namespace Controllers
         /// </summary>
         /// <param name="menuDto"></param>
         /// <returns></returns>
-        [HttpPut("add")]
-        [Log(Title = "菜单管理", BusinessType = BusinessType.INSERT)]
-        [ActionPermissionFilter(Permission = "system:menu:add")]
+        [HttpPost("/v1/skb/sysServer/menu/add")]
         public IActionResult MenuAdd([FromBody] MenuDto menuDto)
         {
             var config = new TypeAdapterConfig();
@@ -163,17 +163,19 @@ namespace Controllers
             if (menu == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
             if (UserConstants.NOT_UNIQUE.Equals(sysMenuService.CheckMenuNameUnique(menu)))
             {
-                return ToResponse(ApiResult.Error($"新增菜单'{menu.Name}'失败,菜单名称已存在"));
+                return ToResponse(ApiResult.Error($"新增菜单'{menu.name}'失败,菜单名称已存在"));
             }
-            if (menu.MenuType == "3" && !menu.Path.StartsWith("http"))
+            if (menu.menuType == "3" && !menu.path.StartsWith("http"))
             {
-                return ToResponse(ApiResult.Error($"新增菜单'{menu.Name}'失败,地址必须以http(s)://开头"));
+                return ToResponse(ApiResult.Error($"新增菜单'{menu.name}'失败,地址必须以http(s)://开头"));
             }
-
-            menu.CreateBy = HttpContext.GetName();
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            menu.CreateBy = loginUser.username;
+            menu.UpdateBy = loginUser.username;
+            menu.DelFlag = "0";
             long result = sysMenuService.AddMenu(menu);
 
-            return ToResponse(result);
+            return SUCCESS(result);
         }
 
         /// <summary>
@@ -181,22 +183,20 @@ namespace Controllers
         /// </summary>
         /// <param name="menuId"></param>
         /// <returns></returns>
-        [HttpDelete("{menuId}")]
-        [Log(Title = "菜单管理", BusinessType = BusinessType.DELETE)]
-        [ActionPermissionFilter(Permission = "system:menu:remove")]
-        public IActionResult Remove(int menuId = 0)
+        [HttpDelete("/v1/skb/sysServer/menu/removeById/{id}")]
+        public IActionResult Remove(int id)
         {
-            if (sysMenuService.HasChildByMenuId(menuId))
+            if (sysMenuService.HasChildByMenuId(id))
             {
                 return ToResponse(ResultCode.CUSTOM_ERROR, "存在子菜单,不允许删除");
             }
-            if (sysRoleMenuService.CheckMenuExistRole(menuId))
+            if (sysRoleMenuService.CheckMenuExistRole(id))
             {
                 return ToResponse(ResultCode.CUSTOM_ERROR, "菜单已分配,不允许删除");
             }
-            int result = sysMenuService.DeleteMenuById(menuId);
+            int result = sysMenuService.DeleteMenuById(id);
 
-            return ToResponse(result);
+            return SUCCESS(result);
         }
 
         /// <summary>
@@ -212,8 +212,8 @@ namespace Controllers
         {
             MenuDto MenuDto = new()
             {
-                MenuId = id,
-                SortOrder = value
+                menuId = id,
+                sortOrder = value
             };
             if (MenuDto == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
 

+ 24 - 26
Controllers/Base/SysPostController.cs

@@ -8,6 +8,7 @@ using Middleware;
 using Model;
 using Model.Base;
 using Services;
+using Util;
 
 
 namespace Controllers
@@ -16,8 +17,6 @@ namespace Controllers
     /// 岗位管理
     /// </summary>
     [Verify]
-    [Route("system/post")]
-    [ApiExplorerSettings(GroupName = "sys")]
     public class SysPostController : BaseController
     {
         private readonly ISysPostService PostService;
@@ -30,12 +29,12 @@ namespace Controllers
         /// 岗位列表查询
         /// </summary>
         /// <returns></returns>
-        [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "system:post:list")]
+        [HttpGet("/v1/skb/sysServer/post/page")]
         public IActionResult List([FromQuery] SysPost post, [FromQuery] PagerInfo pagerInfo)
         {
             var predicate = Expressionable.Create<SysPost>();
-            var list = PostService.GetPages(predicate.ToExpression(), pagerInfo, s => new { s.PostSort });
+            predicate.AndIF(!string.IsNullOrEmpty(post.postName), u => u.postName.Contains(post.postName));
+            var list = PostService.GetPages(predicate.ToExpression(), pagerInfo, s => new { s.postSort });
 
             return SUCCESS(list);
         }
@@ -67,22 +66,24 @@ namespace Controllers
         /// </summary>
         /// <param name="post"></param>
         /// <returns></returns>
-        [HttpPost]
-        [ActionPermissionFilter(Permission = "system:post:add")]
-        [Log(Title = "岗位添加", BusinessType = BusinessType.INSERT)]
+        [HttpPost("/v1/skb/sysServer/post/add")]
         public IActionResult Add([FromBody] SysPost post)
         {
             if (UserConstants.NOT_UNIQUE.Equals(PostService.CheckPostNameUnique(post)))
             {
-                throw new CustomException($"修改岗位{post.PostName}失败,岗位名已存在");
+                return ToResponse(ResultCode.CUSTOM_ERROR, $"修改岗位{post.postName}失败,岗位名已存在");
             }
             if (UserConstants.NOT_UNIQUE.Equals(PostService.CheckPostCodeUnique(post)))
             {
-                throw new CustomException($"修改岗位{post.PostName}失败,岗位编码已存在");
+                return ToResponse(ResultCode.CUSTOM_ERROR, $"修改岗位{post.postName}失败,岗位编码已存在");
             }
-            post.ToCreate(HttpContext);
-
-            return ToResponse(PostService.Add(post));
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            post.CreateBy = loginUser.username;
+            post.UpdateBy = loginUser.username;
+            post.CreateTime = DateTime.Now;
+            post.UpdateTime = DateTime.Now;
+            post.DelFlag = "0";
+            return SUCCESS(PostService.Add(post, true));
         }
 
         /// <summary>
@@ -90,21 +91,21 @@ namespace Controllers
         /// </summary>
         /// <param name="post"></param>
         /// <returns></returns>
-        [HttpPut]
-        [ActionPermissionFilter(Permission = "system:post:edit")]
-        [Log(Title = "岗位编辑", BusinessType = BusinessType.UPDATE)]
+        [HttpPut("/v1/skb/sysServer/post/update")]
         public IActionResult Update([FromBody] SysPost post)
         {
             if (UserConstants.NOT_UNIQUE.Equals(PostService.CheckPostNameUnique(post)))
             {
-                throw new CustomException($"修改岗位{post.PostName}失败,岗位名已存在");
+                return ToResponse(ResultCode.CUSTOM_ERROR, $"修改岗位{post.postName}失败,岗位名已存在");
             }
             if (UserConstants.NOT_UNIQUE.Equals(PostService.CheckPostCodeUnique(post)))
             {
-                throw new CustomException($"修改岗位{post.PostName}失败,岗位编码已存在");
+                return ToResponse(ResultCode.CUSTOM_ERROR, $"修改岗位{post.postName}失败,岗位编码已存在");
             }
-            post.ToUpdate(HttpContext);
-            return ToResponse(PostService.Update(post));
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            post.UpdateBy = loginUser.username;
+            post.UpdateTime = DateTime.Now;
+            return SUCCESS(PostService.Update(post, true));
         }
 
         /// <summary>
@@ -112,13 +113,10 @@ namespace Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpDelete("{id}")]
-        [ActionPermissionFilter(Permission = "system:post:remove")]
-        [Log(Title = "岗位删除", BusinessType = BusinessType.DELETE)]
-        public IActionResult Delete(string id)
+        [HttpDelete("/v1/skb/sysServer/post/removeById/{id}")]
+        public IActionResult Delete(int id)
         {
-            int[] ids = Tools.SpitIntArrary(id);
-            return ToResponse(PostService.Delete(ids));
+            return SUCCESS(PostService.Delete(id));
         }
 
         /// <summary>

+ 1 - 1
Controllers/Base/SysRoleController.cs

@@ -205,7 +205,7 @@ namespace Controllers
         [ActionPermissionFilter(Permission = "system:role:export")]
         public IActionResult ExportRoleMenu(int roleId)
         {
-            MenuQueryDto dto = new() { DelFlag = "0", MenuTypeIds = "M,C,F" };
+            MenuQueryDto dto = new() { delFlag = "0", menuTypeIds = "M,C,F" };
 
             var list = sysMenuService.SelectRoleMenuListByRole(dto, roleId);
 

+ 2 - 0
Filters/GlobalActionMonitor.cs

@@ -97,6 +97,8 @@ namespace Middleware
                                             {
                                                 value = Tools.SpitIntArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", ""), ',');
                                             }
+                                            if(value.ToString() == "-1") value = -1;
+                                            if(value.ToString() == "[]") value = "";
                                             propertyInfos[i].SetValue(entry, value, null);
                                             break;
                                         }

+ 28 - 20
Model/Base/SysMenu.cs

@@ -1,3 +1,5 @@
+using Vo;
+
 namespace Model
 {
     /// <summary>
@@ -10,92 +12,92 @@ namespace Model
         /// <summary>
         /// 菜单ID
         /// </summary>
-        [SugarColumn(ColumnDescription = "菜单ID", ColumnName = "menu_id")]
-        public long MenuId { get; set; }
+        [SugarColumn(ColumnDescription = "菜单ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "menu_id")]
+        public long menuId { get; set; }
 
 
         /// <summary>
         /// 菜单名称
         /// </summary>
         [SugarColumn(ColumnDescription = "菜单名称", Length = 32, ColumnName = "name")]
-        public string Name { get; set; }
+        public string? name { get; set; }
 
 
         /// <summary>
         /// 英文名称
         /// </summary>
         [SugarColumn(ColumnDescription = "英文名称", Length = 128, ColumnName = "en_name")]
-        public string EnName { get; set; }
+        public string? enName { get; set; }
 
 
         /// <summary>
         /// 权限标识
         /// </summary>
         [SugarColumn(ColumnDescription = "权限标识", Length = 32, ColumnName = "permission")]
-        public string Permission { get; set; }
+        public string? permission { get; set; }
 
 
         /// <summary>
         /// 路由路径
         /// </summary>
         [SugarColumn(ColumnDescription = "路由路径", Length = 128, ColumnName = "path")]
-        public string Path { get; set; }
+        public string? path { get; set; }
 
 
         /// <summary>
         /// 父菜单ID
         /// </summary>
         [SugarColumn(ColumnDescription = "父菜单ID", ColumnName = "parent_id")]
-        public long ParentId { get; set; }
+        public long parentId { get; set; }
 
 
         /// <summary>
         /// 菜单图标
         /// </summary>
         [SugarColumn(ColumnDescription = "菜单图标", Length = 64, ColumnName = "icon")]
-        public string Icon { get; set; }
+        public string? icon { get; set; }
 
 
         /// <summary>
         /// 是否可见,0隐藏,1显示
         /// </summary>
         [SugarColumn(ColumnDescription = "是否可见,0隐藏,1显示", Length = 1, ColumnName = "visible")]
-        public string Visible { get; set; }
+        public string? visible { get; set; }
 
 
         /// <summary>
         /// 排序值,越小越靠前
         /// </summary>
         [SugarColumn(ColumnDescription = "排序值,越小越靠前", ColumnName = "sort_order")]
-        public int SortOrder { get; set; }
+        public int sortOrder { get; set; }
 
 
         /// <summary>
         /// 是否缓存,0否,1是
         /// </summary>
         [SugarColumn(ColumnDescription = "是否缓存,0否,1是", Length = 1, ColumnName = "keep_alive")]
-        public string KeepAlive { get; set; }
+        public string? keepAlive { get; set; }
 
 
         /// <summary>
         /// 是否内嵌,0否,1是
         /// </summary>
         [SugarColumn(ColumnDescription = "是否内嵌,0否,1是", Length = 1, ColumnName = "embedded")]
-        public string Embedded { get; set; }
+        public string? embedded { get; set; }
 
 
         /// <summary>
         /// 菜单类型,0目录,1菜单,2按钮
         /// </summary>
         [SugarColumn(ColumnDescription = "菜单类型,0目录,1菜单,2按钮", Length = 1, ColumnName = "menu_type")]
-        public string MenuType { get; set; }
+        public string? menuType { get; set; }
 
 
         /// <summary>
         /// 创建人
         /// </summary>
         [SugarColumn(ColumnDescription = "创建人", Length = 64, ColumnName = "create_by")]
-        public string CreateBy { get; set; }
+        public string? CreateBy { get; set; }
 
 
         /// <summary>
@@ -109,7 +111,7 @@ namespace Model
         /// 修改人
         /// </summary>
         [SugarColumn(ColumnDescription = "修改人", Length = 64, ColumnName = "update_by")]
-        public string UpdateBy { get; set; }
+        public string? UpdateBy { get; set; }
 
 
         /// <summary>
@@ -123,28 +125,34 @@ namespace Model
         /// 删除标志,0未删除,1已删除
         /// </summary>
         [SugarColumn(ColumnDescription = "删除标志,0未删除,1已删除", Length = 1, ColumnName = "del_flag")]
-        public string DelFlag { get; set; }
+        public string? DelFlag { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public TreeSelectMeta meta { get; set; }
+
+        [SugarColumn(IsIgnore = true)]
+        public long id { get; set; }
 
 
         /// <summary>
         /// 子菜单
         /// </summary>
         [SugarColumn(IsIgnore = true)]
-        public List<SysMenu> Children { get; set; } = new List<SysMenu>();
+        public List<SysMenu> children { get; set; } = new List<SysMenu>();
         /// <summary>
         /// 子菜单个数
         /// </summary>
         [SugarColumn(IsIgnore = true)]
-        public int SubNum { get; set; }
+        public int subNum { get; set; }
         /// <summary>
         /// 是否包含子节点,前端用
         /// </summary>
         [SugarColumn(IsIgnore = true)]
-        public bool HasChildren
+        public bool hasChildren
         {
             get
             {
-                return SubNum > 0 || Children.Count > 0;
+                return subNum > 0 || children.Count > 0;
             }
         }
     }

+ 9 - 9
Model/Base/SysPost.cs

@@ -10,43 +10,43 @@ namespace Model
         /// <summary>
         /// 岗位ID
         /// </summary>
-        [SugarColumn(ColumnDescription = "岗位ID", ColumnName = "post_id")]
-        public long PostId { get; set; }
+        [SugarColumn(ColumnDescription = "岗位ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "post_id")]
+        public long postId { get; set; }
 
 
         /// <summary>
         /// 岗位编码
         /// </summary>
         [SugarColumn(ColumnDescription = "岗位编码", Length = 64, ColumnName = "post_code")]
-        public string PostCode { get; set; }
+        public string? postCode { get; set; }
 
 
         /// <summary>
         /// 岗位名称
         /// </summary>
         [SugarColumn(ColumnDescription = "岗位名称", Length = 50, ColumnName = "post_name")]
-        public string PostName { get; set; }
+        public string? postName { get; set; }
 
 
         /// <summary>
         /// 岗位排序
         /// </summary>
         [SugarColumn(ColumnDescription = "岗位排序", ColumnName = "post_sort")]
-        public int PostSort { get; set; }
+        public int postSort { get; set; }
 
 
         /// <summary>
         /// 岗位描述
         /// </summary>
         [SugarColumn(ColumnDescription = "岗位描述", Length = 500, ColumnName = "remark")]
-        public string Remark { get; set; }
+        public string? remark { get; set; }
 
 
         /// <summary>
         /// 是否删除  -1:已删除  0:正常
         /// </summary>
         [SugarColumn(ColumnDescription = "是否删除  -1:已删除  0:正常", Length = 1, ColumnName = "del_flag")]
-        public string DelFlag { get; set; }
+        public string? DelFlag { get; set; }
 
 
         /// <summary>
@@ -60,7 +60,7 @@ namespace Model
         /// 创建人
         /// </summary>
         [SugarColumn(ColumnDescription = "创建人", Length = 64, ColumnName = "create_by")]
-        public string CreateBy { get; set; }
+        public string? CreateBy { get; set; }
 
 
         /// <summary>
@@ -74,7 +74,7 @@ namespace Model
         /// 更新人
         /// </summary>
         [SugarColumn(ColumnDescription = "更新人", Length = 64, ColumnName = "update_by")]
-        public string UpdateBy { get; set; }
+        public string? UpdateBy { get; set; }
 
 
 

+ 29 - 30
Model/Dto/Base/MenuDto.cs

@@ -6,92 +6,91 @@ namespace Dto
     public class MenuDto
     {
         //{"parentId":0,"menuName":"aaa","icon":"documentation","menuType":"M","orderNum":999,"visible":0,"status":0,"path":"aaa"}
-        [Required(ErrorMessage = "菜单id不能为空")]
         [ExcelColumn(Name = "菜单id")]
-        public int MenuId { get; set; }
+        public int menuId { get; set; }
         [ExcelColumn(Name = "菜单名")]
-        public string MenuName { get; set; }
+        public string? name { get; set; }
+        public string? enName { get; set; }
         /// <summary>
         /// 父菜单ID
         /// </summary>
-        public long? ParentId { get; set; }
+        public long parentId { get; set; }
 
         /// <summary>
         /// 显示顺序
         /// </summary>
-        public int SortOrder { get; set; }
+        public int sortOrder { get; set; }
 
         /// <summary>
         /// 路由地址
         /// </summary>
         [ExcelColumn(Name = "路由地址")] 
-        public string Path { get; set; } = "#";
+        public string? path { get; set; } = "#";
 
         /// <summary>
         /// 组件路径
         /// </summary>
         [ExcelColumn(Name = "组件地址")]
-        public string Component { get; set; }
+        public string? component { get; set; }
 
         /// <summary>
         /// 是否缓存(1缓存 0不缓存)
         /// </summary>
         [Required(ErrorMessage = "是否缓存不能为空")]
         [ExcelColumn(Name = "是否缓存")]
-        public int IsCache { get; set; }
+        public int keepAlive { get; set; }
         /// <summary>
         /// 是否外链 1、是 0、否
         /// </summary>
-        public int IsFrame { get; set; }
+        public int embedded { get; set; }
 
         /// <summary>
         /// 类型(M目录 C菜单 F按钮 L链接)
         /// </summary>
         [Required(ErrorMessage = "菜单类型不能为空")]
-        public string MenuType { get; set; }
+        public string? menuType { get; set; }
 
         /// <summary>
         /// 显示状态(0显示 1隐藏)
         /// </summary>
         [Required(ErrorMessage = "显示状态不能为空")]
-        public string Visible { get; set; }
+        public string? visible { get; set; }
 
         /// <summary>
         /// 菜单状态(0正常 1停用)
         /// </summary>
-        [Required(ErrorMessage = "菜单状态不能为空")]
-        public string Status { get; set; }
+        // [Required(ErrorMessage = "菜单状态不能为空")]
+        // public string? status { get; set; }
 
         /// <summary>
         /// 权限字符串
         /// </summary>
-        [ExcelColumn(Name = "权限字符串")]
-        public string Perms { get; set; }
+        public string? permission { get; set; }
 
         /// <summary>
         /// 菜单图标
         /// </summary>
-        public string Icon { get; set; } = string.Empty;
+        public string? icon { get; set; }
         /// <summary>
         /// 翻译key
         /// </summary>
-        public string MenuNameKey { get; set; }
-        public List<MenuDto> Children { get; set; } = new List<MenuDto>();
+        public string? menuNameKey { get; set; }
+        public List<MenuDto> children { get; set; } = new List<MenuDto>();
     }
 
     public class MenuQueryDto
     {
-        public string? MenuName { get; set; }
-        public string? Visible { get; set; }
-        public string? DelFlag { get; set; }
-        public string MenuTypeIds { get; set; } = string.Empty;
-        public int? ParentId { get; set; }
-        public string[] MenuTypeIdArr
-        {
-            get
-            {
-                return MenuTypeIds?.Split(',', StringSplitOptions.RemoveEmptyEntries);
-            }
-        }
+        public string? menuName { get; set; }
+        public string? visible { get; set; }
+        public string? delFlag { get; set; }
+        public string? menuTypeIds { get; set; }
+        public int? parentId { get; set; }
+        // public string[] menuTypeIdArr
+        // {
+        //     get
+        //     {
+        //         return menuTypeIds?.Split(',', StringSplitOptions.RemoveEmptyEntries);
+        //     }
+        // }
     }
 }

+ 27 - 24
Model/Vo/Base/TreeSelectVo.cs

@@ -20,35 +20,37 @@ namespace Vo
         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 TreeSelectMeta meta { get; set; }
+        public string Permission { get; set; }
 
         public TreeSelectVo() { }
 
         public TreeSelectVo(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.Icon = menu.Icon;
-            Permission = new List<string>();
+            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>();
+            Permission = menu.permission;
 
             List<TreeSelectVo> child = new List<TreeSelectVo>();
-            foreach (var item in menu.Children)
+            foreach (var item in menu.children)
             {
-                if(item.MenuType == "0")
-                {
+                // if(item.menuType == "0")
+                // {
                     child.Add(new TreeSelectVo(item));
-                }
-                else
-                {
-                    Permission.Add(item.Permission);
-                }
+                // }
+                // else
+                // {
+                //     Permission.Add(item.permission);
+                // }
             }
 
             Children = child;
@@ -74,9 +76,10 @@ namespace Vo
 
     public class TreeSelectMeta
     {
-        public string Title { get; set; }
-        public string Icon { get; set; }
-        public List<string> Roles { get; set; }
-        public List<string> Auths { get; set; }
+        public string title { get; set; }
+        public string enName { get; set; }
+        public string icon { get; set; }
+        public List<string> roles { get; set; }
+        public List<string> auths { get; set; }
     }
 }

+ 1 - 1
Services/Base/IService/ISysMenuService.cs

@@ -9,7 +9,7 @@ namespace Services
         //List<SysMenu> SelectMenuList(long userId);
 
         List<SysMenu> SelectMenuList(MenuQueryDto menu, long userId);
-        List<SysMenu> SelectTreeMenuList(MenuQueryDto menu, long userId);
+        List<TreeSelectVo> SelectTreeMenuList(MenuQueryDto menu, long userId);
 
         SysMenu GetMenuByMenuId(int menuId);
         List<SysMenu> GetMenusByMenuId(int menuId, long userId);

+ 88 - 82
Services/Base/SysMenuService.cs

@@ -27,13 +27,13 @@ namespace Services
         /// 获取所有菜单数(菜单管理)
         /// </summary>
         /// <returns></returns>
-        public List<SysMenu> SelectTreeMenuList(MenuQueryDto menu, long userId)
+        public List<TreeSelectVo> SelectTreeMenuList(MenuQueryDto menu, long userId)
         {
-            if (menu.ParentId != null)
-            {
-                return GetMenusByMenuId(menu.ParentId.ParseToInt(), userId);
-            }
-            List<SysMenu> menuList = BuildMenuTree(SelectMenuList(menu, userId));
+            // if (menu.parentId != null)
+            // {
+            //     return GetMenusByMenuId(menu.parentId.ParseToInt(), userId);
+            // }
+            List<TreeSelectVo> menuList = BuildMenuTreeSelect(SelectMenuList(menu, userId));
             return menuList;
         }
 
@@ -63,7 +63,7 @@ namespace Services
         /// <returns></returns>
         public SysMenu GetMenuByMenuId(int menuId)
         {
-            return GetFirst(it => it.MenuId == menuId);
+            return GetFirst(it => it.menuId == menuId);
         }
 
         /// <summary>
@@ -75,7 +75,7 @@ namespace Services
         public List<SysMenu> GetMenusByMenuId(int menuId, long userId)
         {
             var menuExpression = Expressionable.Create<SysMenu>();
-            menuExpression.And(c => c.ParentId == menuId);
+            menuExpression.And(c => c.parentId == menuId);
 
             if (!SysRoleService.IsAdmin(userId))
             {
@@ -83,12 +83,12 @@ namespace Services
                 var roleMenus = Context.Queryable<SysRoleMenu>()
                     .Where(r => userRoles.Contains(r.RoleId)).Select(s => s.MenuId).ToList();
 
-                menuExpression.And(c => roleMenus.Contains(c.MenuId));
+                menuExpression.And(c => roleMenus.Contains(c.menuId));
             }
-            var list = GetList(menuExpression.ToExpression()).OrderBy(f => f.SortOrder).ToList();
+            var list = GetList(menuExpression.ToExpression()).OrderBy(f => f.sortOrder).ToList();
             Context.ThenMapper(list, item =>
             {
-                item.SubNum = Context.Queryable<SysMenu>().SetContext(x => x.ParentId, () => item.MenuId, item).Count;
+                item.subNum = Context.Queryable<SysMenu>().SetContext(x => x.parentId, () => item.menuId, item).Count;
             });
             return list;
         }
@@ -101,6 +101,7 @@ namespace Services
         public long AddMenu(SysMenu menu)
         {
             menu.CreateTime = DateTime.Now;
+            menu.UpdateTime = DateTime.Now;
             return InsertReturnBigIdentity(menu);
         }
 
@@ -111,8 +112,9 @@ namespace Services
         /// <returns></returns>
         public long EditMenu(SysMenu menu)
         {
-            menu.Icon = string.IsNullOrEmpty(menu.Icon) ? "" : menu.Icon;
-            return Update(menu, false);
+            menu.UpdateTime = DateTime.Now;
+            menu.icon = string.IsNullOrEmpty(menu.icon) ? "" : menu.icon;
+            return Update(menu, true);
         }
 
         /// <summary>
@@ -132,14 +134,14 @@ namespace Services
         /// <returns></returns>
         public string CheckMenuNameUnique(SysMenu menu)
         {
-            long menuId = menu.MenuId == 0 ? -1 : menu.MenuId;
-            SysMenu info = GetFirst(it => it.Name == menu.Name && it.ParentId == menu.ParentId);
+            long menuId = menu.menuId == 0 ? -1 : menu.menuId;
+            SysMenu info = GetFirst(it => it.name == menu.name && it.parentId == menu.parentId);
 
             //if (info != null && menuId != info.menuId && menu.menuName.Equals(info.menuName))
             //{
             //    return UserConstants.NOT_UNIQUE;
             //}
-            if (info != null && info.MenuId != menu.MenuId)
+            if (info != null && info.menuId != menu.menuId)
             {
                 return UserConstants.NOT_UNIQUE;
             }
@@ -153,7 +155,7 @@ namespace Services
         /// <returns></returns>
         public int ChangeSortMenu(MenuDto menuDto)
         {
-            return Update(new SysMenu() { MenuId = menuDto.MenuId, SortOrder = menuDto.SortOrder }, it => new { it.SortOrder });
+            return Update(new SysMenu() { menuId = menuDto.menuId, sortOrder = menuDto.sortOrder }, it => new { it.sortOrder });
         }
 
         /// <summary>
@@ -163,7 +165,7 @@ namespace Services
         /// <returns></returns>
         public bool HasChildByMenuId(long menuId)
         {
-            return Count(it => it.ParentId == menuId) > 0;
+            return Count(it => it.parentId == menuId) > 0;
         }
 
         /// <summary>
@@ -173,7 +175,7 @@ namespace Services
         /// <returns></returns>
         public List<SysMenu> SelectMenuTreeByUserId(long userId)
         {
-            MenuQueryDto dto = new() { DelFlag = "0", MenuTypeIds = "M,C" };
+            MenuQueryDto dto = new() { delFlag = "0", menuTypeIds = "M,C" };
             if (SysRoleService.IsAdmin(userId))
             {
                 return SelectTreeMenuList(dto);
@@ -193,16 +195,16 @@ namespace Services
         public List<string> SelectMenuPermsByUserId(long userId)
         {
             var menus = Context.Queryable<SysMenu, SysRoleMenu, SysUserRole, SysRole>((m, rm, ur, r) => new JoinQueryInfos(
-                JoinType.Left, m.MenuId == rm.MenuId,
+                JoinType.Left, m.menuId == rm.MenuId,
                 JoinType.Left, rm.RoleId == ur.RoleId,
                 JoinType.Left, ur.RoleId == r.RoleId
                 ))
                 .WithCache(60 * 10)
                 .Where((m, rm, ur, r) => m.DelFlag == "0" && ur.UserId == userId)
                 .Select((m, rm, ur, r) => m).ToList();
-            var menuList = menus.Where(f => !string.IsNullOrEmpty(f.Permission));
+            var menuList = menus.Where(f => !string.IsNullOrEmpty(f.permission));
 
-            return menuList.Select(x => x.Permission).Distinct().ToList();
+            return menuList.Select(x => x.permission).Distinct().ToList();
         }
 
         /// <summary>
@@ -218,14 +220,14 @@ namespace Services
                 .Select(f => f.MenuId).Distinct().ToList();
 
             return Queryable()
-                .Where(c => roleMenus.Contains(c.MenuId))
-                .WhereIF(!string.IsNullOrEmpty(menu.MenuName), (c) => c.Name.Contains(menu.MenuName))
-                .WhereIF(!string.IsNullOrEmpty(menu.Visible), (c) => c.Visible == menu.Visible)
-                .WhereIF(!string.IsNullOrEmpty(menu.DelFlag), (c) => c.DelFlag == menu.DelFlag)
-                .WhereIF(!string.IsNullOrEmpty(menu.MenuTypeIds), c => menu.MenuTypeIdArr.Contains(c.MenuType))
-                .OrderBy((c) => new { c.ParentId, c.SortOrder })
+                .Where(c => roleMenus.Contains(c.menuId))
+                .WhereIF(!string.IsNullOrEmpty(menu.menuName), (c) => c.name.Contains(menu.menuName))
+                .WhereIF(!string.IsNullOrEmpty(menu.visible), (c) => c.visible == menu.visible)
+                .WhereIF(!string.IsNullOrEmpty(menu.delFlag), (c) => c.DelFlag == menu.delFlag)
+                // .WhereIF(!string.IsNullOrEmpty(menu.menuTypeIds), c => menu.menuTypeIdArr.Contains(c.menuType))
+                .OrderBy((c) => new { c.parentId, c.sortOrder })
                 .Select(c => c)
-                .ToTree(it => it.Children, it => it.ParentId, 0);
+                .ToTree(it => it.children, it => it.parentId, 0);
         }
 
         /// <summary>
@@ -241,16 +243,16 @@ namespace Services
                 .Select(f => f.MenuId).Distinct().ToList();
 
             return Context.Queryable<SysMenu>()
-                .InnerJoin<SysMenu>((t1, t2) => t1.MenuId == t2.ParentId)
-                .InnerJoin<SysMenu>((t1, t2, t3) => t2.MenuId == t3.ParentId)
-                .Where((t1, t2, t3) => menuIds.Contains(t1.MenuId))
+                .InnerJoin<SysMenu>((t1, t2) => t1.menuId == t2.parentId)
+                .InnerJoin<SysMenu>((t1, t2, t3) => t2.menuId == t3.parentId)
+                .Where((t1, t2, t3) => menuIds.Contains(t1.menuId))
                 .Select((t1, t2, t3) => new RoleMenuExportDto()
                 {
-                    MenuName = $"{t1.Name}->{t2.Name}->{t3.Name}",
-                    Path = t2.Path,
-                    Component = t2.Path,
-                    Perms = t3.Permission,
-                    MenuType = (MenuType)(object)t3.MenuType,
+                    MenuName = $"{t1.name}->{t2.name}->{t3.name}",
+                    Path = t2.path,
+                    Component = t2.path,
+                    Perms = t3.permission,
+                    MenuType = (MenuType)(object)t3.menuType,
                     Status = (MenuStatus)(object)t3.DelFlag
                 }).ToList();
         }
@@ -262,15 +264,15 @@ namespace Services
         private List<SysMenu> SelectMenuList(MenuQueryDto menu)
         {
             var menuExp = Expressionable.Create<SysMenu>();
-            menuExp.AndIF(!string.IsNullOrEmpty(menu.MenuName), it => it.Name.Contains(menu.MenuName));
-            menuExp.AndIF(!string.IsNullOrEmpty(menu.Visible), it => it.Visible == menu.Visible);
-            menuExp.AndIF(!string.IsNullOrEmpty(menu.DelFlag), it => it.DelFlag == menu.DelFlag);
-            menuExp.AndIF(!string.IsNullOrEmpty(menu.MenuTypeIds), it => menu.MenuTypeIdArr.Contains(it.MenuType));
-            menuExp.AndIF(menu.ParentId != null, it => it.ParentId == menu.ParentId);
+            menuExp.AndIF(!string.IsNullOrEmpty(menu.menuName), it => it.name.Contains(menu.menuName));
+            menuExp.AndIF(!string.IsNullOrEmpty(menu.visible), it => it.visible == menu.visible);
+            menuExp.AndIF(!string.IsNullOrEmpty(menu.delFlag), it => it.DelFlag == menu.delFlag);
+            // menuExp.AndIF(!string.IsNullOrEmpty(menu.menuTypeIds), it => menu.menuTypeIdArr.Contains(it.menuType));
+            menuExp.AndIF(menu.parentId != null, it => it.parentId == menu.parentId);
 
             return Queryable()
             .Where(menuExp.ToExpression())
-            .OrderBy(it => new { it.ParentId, it.SortOrder })
+            .OrderBy(it => new { it.parentId, it.sortOrder })
             .ToList();
         }
 
@@ -286,11 +288,11 @@ namespace Services
                 .Where(r => roles.Contains(r.RoleId));
 
             return Queryable()
-                .InnerJoin(roleMenus, (c, j) => c.MenuId == j.MenuId)
+                .InnerJoin(roleMenus, (c, j) => c.menuId == j.MenuId)
                 .Where((c, j) => c.DelFlag == "0")
-                .WhereIF(!string.IsNullOrEmpty(sysMenu.MenuName), (c, j) => c.Name.Contains(sysMenu.MenuName))
-                .WhereIF(!string.IsNullOrEmpty(sysMenu.Visible), (c, j) => c.Visible == sysMenu.Visible)
-                .OrderBy((c, j) => new { c.ParentId, c.SortOrder })
+                .WhereIF(!string.IsNullOrEmpty(sysMenu.menuName), (c, j) => c.name.Contains(sysMenu.menuName))
+                .WhereIF(!string.IsNullOrEmpty(sysMenu.visible), (c, j) => c.visible == sysMenu.visible)
+                .OrderBy((c, j) => new { c.parentId, c.sortOrder })
                 .Select(c => c)
                 .ToList();
         }
@@ -301,17 +303,17 @@ namespace Services
         /// <returns></returns>
         public List<SysMenu> SelectTreeMenuList(MenuQueryDto menu)
         {
-            int parentId = menu.ParentId != null ? (int)menu.ParentId : 0;
+            int parentId = menu.parentId != null ? (int)menu.parentId : 0;
 
             var list = Queryable()
                 .WithCache(60 * 10)
-                .WhereIF(!string.IsNullOrEmpty(menu.MenuName), it => it.Name.Contains(menu.MenuName))
-                .WhereIF(!string.IsNullOrEmpty(menu.Visible), it => it.Visible == menu.Visible)
-                .WhereIF(!string.IsNullOrEmpty(menu.DelFlag), it => it.DelFlag == menu.DelFlag)
-                .WhereIF(!string.IsNullOrEmpty(menu.MenuTypeIds), it => menu.MenuTypeIdArr.Contains(it.MenuType))
-                .WhereIF(menu.ParentId != null, it => it.ParentId == menu.ParentId)
-                .OrderBy(it => new { it.ParentId, it.SortOrder })
-                .ToTree(it => it.Children, it => it.ParentId, parentId);
+                .WhereIF(!string.IsNullOrEmpty(menu.menuName), it => it.name.Contains(menu.menuName))
+                .WhereIF(!string.IsNullOrEmpty(menu.visible), it => it.visible == menu.visible)
+                .WhereIF(!string.IsNullOrEmpty(menu.delFlag), it => it.DelFlag == menu.delFlag)
+                // .WhereIF(!string.IsNullOrEmpty(menu.menuTypeIds), it => menu.menuTypeIdArr.Contains(it.menuType))
+                .WhereIF(menu.parentId != null, it => it.parentId == menu.parentId)
+                .OrderBy(it => new { it.parentId, it.sortOrder })
+                .ToTree(it => it.children, it => it.parentId, parentId);
 
             return list;
         }
@@ -346,7 +348,11 @@ namespace Services
         {
             //得到子节点列表
             List<SysMenu> childList = GetChildList(list, t);
-            t.Children = childList;
+            t.children = childList;
+            t.meta = new TreeSelectMeta();
+            t.meta.title = t.name;
+            t.meta.icon = t.icon;
+            t.id = t.menuId;
             foreach (var item in childList)
             {
                 if (GetChildList(list, item).Count() > 0)
@@ -364,7 +370,7 @@ namespace Services
         /// <returns></returns>
         private List<SysMenu> GetChildList(List<SysMenu> list, SysMenu sysMenu)
         {
-            return list.Where(p => p.ParentId == sysMenu.MenuId).ToList();
+            return list.Where(p => p.parentId == sysMenu.menuId).ToList();
         }
 
         /// <summary>
@@ -381,16 +387,16 @@ namespace Services
             {
                 RouterVo router = new()
                 {
-                    Hidden = "1".Equals(menu.Visible),
+                    Hidden = "1".Equals(menu.visible),
                     Name = GetRouteName(menu),
                     Path = GetRoutePath(menu),
                     Component = GetComponent(menu),
-                    Meta = new Meta(menu.Name, menu.Icon, "1".Equals(menu.KeepAlive), menu.EnName, menu.Path, menu.CreateTime.Value)
+                    Meta = new Meta(menu.name, menu.icon, "1".Equals(menu.keepAlive), menu.enName, menu.path, menu.CreateTime.Value)
                 };
 
-                List<SysMenu> cMenus = menu.Children;
+                List<SysMenu> cMenus = menu.children;
                 //是目录并且有子菜单
-                if (cMenus != null && cMenus.Count > 0 && UserConstants.TYPE_DIR.Equals(menu.MenuType))
+                if (cMenus != null && cMenus.Count > 0 && UserConstants.TYPE_DIR.Equals(menu.menuType))
                 {
                     router.AlwaysShow = true;
                     router.Redirect = "noRedirect";
@@ -402,24 +408,24 @@ namespace Services
                     List<RouterVo> childrenList = new();
                     RouterVo children = new()
                     {
-                        Path = menu.Path,
-                        Name = string.IsNullOrEmpty(menu.Path) ? "" : menu.Path.ToLower(),
-                        Meta = new Meta(menu.Name, menu.Icon, "1".Equals(menu.KeepAlive), menu.EnName, menu.Path, menu.CreateTime.Value)
+                        Path = menu.path,
+                        Name = string.IsNullOrEmpty(menu.path) ? "" : menu.path.ToLower(),
+                        Meta = new Meta(menu.name, menu.icon, "1".Equals(menu.keepAlive), menu.enName, menu.path, menu.CreateTime.Value)
                     };
                     childrenList.Add(children);
                     router.Children = childrenList;
                 }
-                else if (menu.ParentId == 0 && IsInnerLink(menu))
+                else if (menu.parentId == 0 && IsInnerLink(menu))
                 {
-                    router.Meta = new Meta(menu.Name, menu.Icon);
+                    router.Meta = new Meta(menu.name, menu.icon);
                     router.Path = "/";
                     List<RouterVo> childrenList = new();
                     RouterVo children = new();
-                    string routerPath = InnerLinkReplaceEach(menu.Path);
+                    string routerPath = InnerLinkReplaceEach(menu.path);
                     children.Path = routerPath;
                     children.Component = UserConstants.INNER_LINK;
                     children.Name = routerPath.ToLower();
-                    children.Meta = new Meta(menu.Name, menu.Icon, menu.Path);
+                    children.Meta = new Meta(menu.name, menu.icon, menu.path);
                     childrenList.Add(children);
                     router.Children = childrenList;
                 }
@@ -437,16 +443,16 @@ namespace Services
         public List<SysMenu> BuildMenuTree(List<SysMenu> menus)
         {
             List<SysMenu> returnList = new();
-            List<long> tempList = menus.Select(f => f.MenuId).ToList();
+            List<long> tempList = menus.Select(f => f.menuId).ToList();
 
             foreach (var menu in menus)
             {
                 // 如果是顶级节点, 遍历该父节点的所有子节点
-                if (!tempList.Contains(menu.ParentId))
+                if (!tempList.Contains(menu.parentId))
                 {
-                    var menuInfo = menus.Find(f => f.MenuId == menu.MenuId);
+                    var menuInfo = menus.Find(f => f.menuId == menu.menuId);
                     //移除按钮没有上级
-                    if (!tempList.Contains(menuInfo.ParentId) && menu.MenuType != "F")
+                    if (!tempList.Contains(menuInfo.parentId) && menu.menuType != "F")
                     {
                         RecursionFn(menus, menu);
                         returnList.Add(menu);
@@ -483,7 +489,7 @@ namespace Services
         /// <returns>路由名称</returns>
         public string GetRouteName(SysMenu menu)
         {
-            string routerName = menu.Path.ToLower();
+            string routerName = menu.path.ToLower();
             // 非外链并且是一级目录(类型为目录)
             if (IsMeunFrame(menu))
             {
@@ -499,17 +505,17 @@ namespace Services
         /// <returns>路由地址</returns>
         public string GetRoutePath(SysMenu menu)
         {
-            string routerPath = menu.Path;
+            string routerPath = menu.path;
             // 内链打开外网方式
-            if (menu.ParentId != 0 && IsInnerLink(menu))
+            if (menu.parentId != 0 && IsInnerLink(menu))
             {
                 routerPath = InnerLinkReplaceEach(routerPath);
             }
             // 非外链并且是一级目录(类型为目录)
-            if (0 == menu.ParentId && UserConstants.TYPE_DIR.Equals(menu.MenuType)
-                && UserConstants.NO_FRAME.Equals(menu.Embedded))
+            if (0 == menu.parentId && UserConstants.TYPE_DIR.Equals(menu.menuType)
+                && UserConstants.NO_FRAME.Equals(menu.embedded))
             {
-                routerPath = "/" + menu.Path;
+                routerPath = "/" + menu.path;
             }
             else if (IsMeunFrame(menu))// 非外链并且是一级目录(类型为菜单)
             {
@@ -548,8 +554,8 @@ namespace Services
         /// <returns></returns>
         public bool IsMeunFrame(SysMenu menu)
         {
-            return menu.ParentId == 0 && UserConstants.TYPE_MENU.Equals(menu.MenuType)
-                && menu.Embedded.Equals(UserConstants.NO_FRAME);
+            return menu.parentId == 0 && UserConstants.TYPE_MENU.Equals(menu.menuType)
+                && menu.embedded.Equals(UserConstants.NO_FRAME);
         }
 
         /// <summary>
@@ -559,7 +565,7 @@ namespace Services
         /// <returns>结果</returns>
         public bool IsInnerLink(SysMenu menu)
         {
-            return menu.Embedded.Equals(UserConstants.NO_FRAME) && Tools.IsUrl(menu.Path);
+            return menu.embedded.Equals(UserConstants.NO_FRAME) && Tools.IsUrl(menu.path);
         }
 
         /// <summary>
@@ -569,7 +575,7 @@ namespace Services
         /// <returns></returns>
         public bool IsParentView(SysMenu menu)
         {
-            return menu.ParentId != 0 && UserConstants.TYPE_DIR.Equals(menu.MenuType);
+            return menu.parentId != 0 && UserConstants.TYPE_DIR.Equals(menu.menuType);
         }
 
         /// <summary>

+ 4 - 4
Services/Base/SysPostService.cs

@@ -17,8 +17,8 @@ namespace Services
         /// <returns></returns>
         public string CheckPostCodeUnique(SysPost post)
         {
-            SysPost info = GetFirst(it => it.PostCode.Equals(post.PostCode));
-            if (info != null && info.PostId != post.PostId)
+            SysPost info = GetFirst(it => it.postCode.Equals(post.postCode));
+            if (info != null && info.postId != post.postId)
             {
                 return UserConstants.NOT_UNIQUE;
             }
@@ -32,8 +32,8 @@ namespace Services
         /// <returns></returns>
         public string CheckPostNameUnique(SysPost post)
         {
-            SysPost info = GetFirst(it => it.PostName.Equals(post.PostName));
-            if (info != null && info.PostId != post.PostId)
+            SysPost info = GetFirst(it => it.postName.Equals(post.postName));
+            if (info != null && info.postId != post.postId)
             {
                 return UserConstants.NOT_UNIQUE;
             }

+ 2 - 2
Services/Base/SysUserPostService.cs

@@ -44,7 +44,7 @@ namespace Services
         public string GetPostsStrByUserId(long userId)
         {
             var list = SelectPostsByUserId(userId);
-            return string.Join(',', list.Select(x => x.PostName));
+            return string.Join(',', list.Select(x => x.postName));
         }
 
         public bool Delete(long userId)
@@ -60,7 +60,7 @@ namespace Services
         public List<SysPost> SelectPostsByUserId(long userId)
         {
             return Context.Queryable<SysPost, SysUserPost>((p, up) => new JoinQueryInfos(
-                JoinType.Left, up.PostId == p.PostId
+                JoinType.Left, up.PostId == p.postId
                 )).Where((p, up) => up.UserId == userId)
                 .Select<SysPost>().ToList();
         }

+ 1 - 1
Services/Base/SysUserService.cs

@@ -59,7 +59,7 @@ namespace Services
                 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));
+                sub.PostList = PostService.GetList(m => userPost.Contains(m.postId));
             }
 
             return result;