备份

Controllers/Base/SysDeptController.cs

@@ -166,7 +166,7 @@ namespace Controllers
             {
                 return ToResponse(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除");
             }
-            if (UserService.Queryable().Count(it => it.DeptId == deptId && it.DelFlag == "0") > 0)
+            if (UserService.Queryable().Count(it => it.deptId == deptId && it.DelFlag == "0") > 0)
             {
                 return ToResponse(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除");
             }

Controllers/Base/SysLoginController.cs

@@ -59,12 +59,12 @@ namespace Controllers
             string location = ""; //HttpContextExtension.GetIpInfo(loginBody.LoginIP);
             var user = sysLoginService.Login(loginBody, new SysLogininfor() { LoginLocation = location });
 
-            List<SysRole> roles = roleService.SelectUserRoleListByUserId(user.UserId);
+            List<SysRole> roles = roleService.SelectUserRoleListByUserId(user.userId);
             //权限集合 eg *:*:*,system:user:list
             List<string> permissions = permissionService.GetMenuPermission(user);
 
             TokenModel loginUser = new(user.Adapt<TokenModel>(), roles.Adapt<List<Roles>>());
-            CacheService.SetUserPerms(GlobalConstant.UserPermKEY + user.UserId, permissions);
+            CacheService.SetUserPerms(GlobalConstant.UserPermKEY + user.userId, permissions);
             
             return SUCCESS(sysLoginService.GetLoginInfo(loginUser));
         }
@@ -135,7 +135,7 @@ namespace Controllers
         {
             dto.UserIP = HttpContext.GetClientUserIp();
             SysUser user = sysUserService.Register(dto);
-            if (user.UserId > 0)
+            if (user.userId > 0)
             {
                 return SUCCESS(user);
             }

Controllers/Base/SysUserController.cs

@@ -13,6 +13,7 @@ using MiniExcelLibs;
 using Model;
 using Model.Base;
 using Services;
+using Util;
 
 namespace Controllers
 {
@@ -90,12 +91,19 @@ namespace Controllers
         {
             var user = parm.Adapt<SysUser>().ToCreate(HttpContext);
             if (user == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
-            if (UserConstants.NOT_UNIQUE.Equals(UserService.CheckUserNameUnique(user.Username)))
+            if (UserConstants.NOT_UNIQUE.Equals(UserService.CheckUserNameUnique(user.username)))
             {
-                return ToResponse(ApiResult.Error($"新增用户 '{user.Username}'失败，登录账号已存在"));
+                return ToResponse(ApiResult.Error($"新增用户 '{user.username}'失败，登录账号已存在"));
             }
 
-            user.Password = Function.MD532(user.Password);
+            user.RoleIds = parm.role;
+            user.PostIds = parm.post;
+            user.password = Function.MD532(Function.CheckNull(user.password));
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            user.CreateBy = loginUser.Username;
+            user.UpdateBy = loginUser.Username;
+            user.LockFlag = "0";
+            user.DelFlag = "0";
 
             return SUCCESS(UserService.InsertUser(user));
         }
@@ -109,11 +117,16 @@ namespace Controllers
         public IActionResult UpdateUser([FromBody] SysUserDto parm)
         {
             var user = parm.Adapt<SysUser>().ToUpdate(HttpContext);
-            if (user == null || user.UserId <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
+            if (user == null || user.userId <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
+
+            user.RoleIds = parm.role;
+            user.PostIds = parm.post;
+            TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
+            user.UpdateBy = loginUser.Username;
 
             int upResult = UserService.UpdateUser(user);
 
-            return ToResponse(upResult);
+            return SUCCESS(upResult);
         }
 
         /// <summary>
@@ -144,7 +157,7 @@ namespace Controllers
             if (id == 1) return ToResponse(ResultCode.FAIL, "不能删除管理员账号");
             int result = UserService.DeleteUser(id);
 
-            return ToResponse(result);
+            return SUCCESS(result);
         }
 
         /// <summary>
@@ -157,9 +170,9 @@ namespace Controllers
         public IActionResult ResetPwd([FromBody] SysUserDto sysUser)
         {
             //密码md5
-            sysUser.Password = Function.MD532(sysUser.Password);
+            sysUser.password = Function.MD532(sysUser.password);
 
-            int result = UserService.ResetPwd(sysUser.UserId, sysUser.Password);
+            int result = UserService.ResetPwd(sysUser.userId, sysUser.password);
             return ToResponse(result);
         }
 
@@ -207,7 +220,7 @@ namespace Controllers
         {
             var list = UserService.SelectUserList(user, new PagerInfo(1, 10000));
 
-            var result = ExportExcelMini(list.Result, "user", "用户列表");
+            var result = ExportExcelMini(list.Records, "user", "用户列表");
             return ExportExcel(result.Item2, result.Item1);
         }
     }

Filters/GlobalActionMonitor.cs

@@ -83,10 +83,19 @@ namespace Middleware
                                         if (propertyInfos[i].Name == key)
                                         {
                                             object value = dictionary[key];
-                                            if (propertyInfos[i].GetMethod.ReturnParameter.ParameterType.Name == "Int32")
+                                            string ParameterType = propertyInfos[i].GetMethod.ReturnParameter.ParameterType.Name;
+                                            if (ParameterType == "Int32")
                                             {
                                                 value = Convert.ToInt32(value);
                                             }
+                                            else if (ParameterType == "Int64[]")
+                                            {
+                                                value = Tools.SpitLongArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", ""), ',');
+                                            }
+                                            else if (ParameterType == "Int32[]")
+                                            {
+                                                value = Tools.SpitIntArrary(Newtonsoft.Json.JsonConvert.SerializeObject(value).Replace("[", "").Replace("]", ""), ',');
+                                            }
                                             propertyInfos[i].SetValue(entry, value, null);
                                             break;
                                         }

Model/Base/PagedInfo.cs

@@ -18,7 +18,7 @@ namespace Model.Base
         /// <summary>
         /// 总记录数
         /// </summary>
-        public int TotalNum { get; set; }
+        public int Total { get; set; }
         /// <summary>
         /// 总页数
         /// </summary>
@@ -26,9 +26,9 @@ namespace Model.Base
         {
             get
             {
-                if (TotalNum > 0)
+                if (Total > 0)
                 {
-                    return TotalNum % this.PageSize == 0 ? TotalNum / this.PageSize : TotalNum / this.PageSize + 1;
+                    return Total % this.PageSize == 0 ? Total / this.PageSize : Total / this.PageSize + 1;
                 }
                 else
                 {
@@ -37,7 +37,7 @@ namespace Model.Base
             }
             set { }
         }
-        public List<T> Result { get; set; }
+        public List<T> Records { get; set; }
         public Dictionary<string, object> Extra { get; set; } = new Dictionary<string, object>();
         public PagedInfo()
         {

Model/Base/PagerInfo.cs

@@ -21,7 +21,7 @@
         /// <summary>
         /// 排序类型,前端传入的是"ascending"，"descending"
         /// </summary>
-        public string SortType { get; set; } = string.Empty;
+        public string sortType { get; set; } = string.Empty;
         public PagerInfo()
         {
             pageNum = 1;

Model/Base/SysUser.cs

@@ -12,71 +12,71 @@ namespace Model
         /// <summary>
         /// 用户ID
         /// </summary>
-        [SugarColumn(ColumnDescription = "用户ID", ColumnName = "user_id")]
-        public long UserId { get; set; }
+        [SugarColumn(ColumnDescription = "用户ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "user_id")]
+        public long userId { get; set; }
 
 
         /// <summary>
         /// 用户名
         /// </summary>
         [SugarColumn(ColumnDescription = "用户名", Length = 64, ColumnName = "username")]
-        public string Username { get; set; }
+        public string username { get; set; }
 
 
         /// <summary>
         /// 密码
         /// </summary>
         [SugarColumn(ColumnDescription = "密码", Length = 255, ColumnName = "password")]
-        public string Password { get; set; }
+        public string password { get; set; }
 
 
         /// <summary>
         /// 盐值
         /// </summary>
         [SugarColumn(ColumnDescription = "盐值", Length = 255, ColumnName = "salt")]
-        public string Salt { get; set; }
+        public string salt { get; set; }
 
 
         /// <summary>
         /// 电话号码
         /// </summary>
         [SugarColumn(ColumnDescription = "电话号码", Length = 20, ColumnName = "phone")]
-        public string Phone { get; set; }
+        public string phone { get; set; }
 
 
         /// <summary>
         /// 头像
         /// </summary>
         [SugarColumn(ColumnDescription = "头像", Length = 255, ColumnName = "avatar")]
-        public string Avatar { get; set; }
+        public string avatar { get; set; }
 
 
         /// <summary>
         /// 昵称
         /// </summary>
         [SugarColumn(ColumnDescription = "昵称", Length = 64, ColumnName = "nickname")]
-        public string Nickname { get; set; }
+        public string nickname { get; set; }
 
 
         /// <summary>
         /// 姓名
         /// </summary>
         [SugarColumn(ColumnDescription = "姓名", Length = 64, ColumnName = "name")]
-        public string Name { get; set; }
+        public string name { get; set; }
 
 
         /// <summary>
         /// 邮箱地址
         /// </summary>
         [SugarColumn(ColumnDescription = "邮箱地址", Length = 128, ColumnName = "email")]
-        public string Email { get; set; }
+        public string email { get; set; }
 
 
         /// <summary>
         /// 所属部门ID
         /// </summary>
         [SugarColumn(ColumnDescription = "所属部门ID", ColumnName = "dept_id")]
-        public long DeptId { get; set; }
+        public long deptId { get; set; }
 
 
         /// <summary>
@@ -172,9 +172,17 @@ namespace Model
         public int[] PostIds { get; set; }
 
 
+        [SugarColumn(IsIgnore = true)]
+        public List<SysRole> RoleList { get; set; }
+
+
+        [SugarColumn(IsIgnore = true)]
+        public List<SysPost> PostList { get; set; }
+
+
         public bool IsAdmin()
         {
-            return IsAdmin(UserId);
+            return IsAdmin(userId);
         }
         public static bool IsAdmin(long userId)
         {

Model/Dto/Base/SysUserDto.cs

@@ -2,40 +2,31 @@
 {
     public class SysUserDto
     {
-        public long UserId { get; set; }
-        public string UserName { get; set; }
-        public string NickName { get; set; }
-        public string Email { get; set; }
-        public string Remark { get; set; }
-        public string Phonenumber { get; set; }
-        /// <summary>
-        /// 用户性别（0男 1女 2未知）
-        /// </summary>
-        public int Sex { get; set; }
-        public string Password { get; set; }
+        public long userId { get; set; }
+        public string? username { get; set; }
+        public string? nickname { get; set; }
+        public string? email { get; set; }
+        public string? remark { get; set; }
+        public string? phone { get; set; }
+        public string? password { get; set; }
 
         /// <summary>
         /// 帐号状态（0正常 1停用）
         /// </summary>
-        public int Status { get; set; }
-
-        /// <summary>
-        /// 最后登录IP
-        /// </summary>
-        public string LoginIP { get; set; }
+        public int status { get; set; }
 
         /// <summary>
         /// 部门Id
         /// </summary>
-        public long DeptId { get; set; }
+        public long deptId { get; set; }
         /// <summary>
         /// 角色id集合
         /// </summary>
-        public long[] RoleIds { get; set; }
+        public long[] role { get; set; }
         /// <summary>
         /// 岗位集合
         /// </summary>
-        public int[] PostIds { get; set; }
+        public int[] post { get; set; }
     }
 
     public class SysUserQueryDto

Repository/BaseRepository.cs

@@ -308,16 +308,16 @@ namespace Repository
         {
             var page = new PagedInfo<T>();
             var total = 0;
-            page.PageSize = parm.PageSize;
-            page.PageIndex = parm.PageNum;
-            if (parm.Sort.IsNotEmpty())
+            page.PageSize = parm.pageSize;
+            page.PageIndex = parm.pageNum;
+            if (parm.sort.IsNotEmpty())
             {
-                source.OrderByPropertyName(parm.Sort, parm.SortType.Contains("desc") ? OrderByType.Desc : OrderByType.Asc);
+                source.OrderByPropertyName(parm.sort, parm.sortType.Contains("desc") ? OrderByType.Desc : OrderByType.Asc);
             }
-            page.Result = source
+            page.Records = source
                 //.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(!string.IsNullOrWhiteSpace(parm.SortType) && parm.SortType.Contains("desc") ? "desc" : "asc")}")
-                .ToPageList(parm.PageNum, parm.PageSize, ref total);
-            page.TotalNum = total;
+                .ToPageList(parm.pageNum, parm.pageSize, ref total);
+            page.Total = total;
             return page;
         }
 
@@ -333,18 +333,18 @@ namespace Repository
         {
             var page = new PagedInfo<T2>();
             var total = 0;
-            page.PageSize = parm.PageSize;
-            page.PageIndex = parm.PageNum;
-            if (parm.Sort.IsNotEmpty())
+            page.PageSize = parm.pageSize;
+            page.PageIndex = parm.pageNum;
+            if (parm.sort.IsNotEmpty())
             {
-                source.OrderByPropertyName(parm.Sort, parm.SortType.Contains("desc") ? OrderByType.Desc : OrderByType.Asc);
+                source.OrderByPropertyName(parm.sort, parm.sortType.Contains("desc") ? OrderByType.Desc : OrderByType.Asc);
             }
             var result = source
                 //.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(!string.IsNullOrWhiteSpace(parm.SortType) && parm.SortType.Contains("desc") ? "desc" : "asc")}")
-                .ToPageList(parm.PageNum, parm.PageSize, ref total);
+                .ToPageList(parm.pageNum, parm.pageSize, ref total);
 
-            page.TotalNum = total;
-            page.Result = result.Adapt<List<T2>>();
+            page.Total = total;
+            page.Records = result.Adapt<List<T2>>();
             return page;
         }
     }

Services/Base/IService/ISysUserPostService.cs

@@ -2,7 +2,7 @@
 
 namespace Services
 {
-    public interface ISysUserPostService
+    public interface ISysUserPostService : IBaseService<SysUserPost>
     {
         public void InsertUserPost(SysUser user);
 

Services/Base/SysLoginService.cs

@@ -85,8 +85,8 @@ namespace Services
         /// <returns></returns>
         public SysUser Login(LoginBodyDto loginBody, SysLogininfor logininfor)
         {
-            SysUser user = SysUserService.GetFirst(m => m.Username == loginBody.username);
-            loginBody.password = Function.MD532(loginBody.password + user.Salt);
+            SysUser user = SysUserService.GetFirst(m => m.username == loginBody.username);
+            loginBody.password = Function.MD532(loginBody.password + user.salt);
             user = SysUserService.Login(loginBody);
             logininfor.UserName = loginBody.username;
             logininfor.Status = "1";
@@ -97,7 +97,7 @@ namespace Services
             logininfor.Browser = clientInfo.ToString();
             logininfor.Os = clientInfo.OS.ToString();
 
-            if (user == null || user.UserId <= 0)
+            if (user == null || user.userId <= 0)
             {
                 logininfor.Msg = "用户名或密码错误";
                 AddLoginInfo(logininfor);
@@ -113,7 +113,7 @@ namespace Services
             logininfor.Status = "0";
             logininfor.Msg = "登录成功";
             AddLoginInfo(logininfor);
-            SysUserService.UpdateLoginInfo(loginBody.loginIP, user.UserId);
+            SysUserService.UpdateLoginInfo(loginBody.loginIP, user.userId);
             return user;
         }
         /// <summary>
@@ -125,7 +125,7 @@ namespace Services
         /// <returns></returns>
         public SysUser PhoneLogin(PhoneLoginDto loginBody, SysLogininfor logininfor, SysUser user)
         {
-            logininfor.UserName = user.Username;
+            logininfor.UserName = user.username;
             logininfor.Status = "1";
             logininfor.LoginTime = DateTime.Now;
             logininfor.Ipaddr = loginBody.LoginIP;
@@ -144,7 +144,7 @@ namespace Services
             logininfor.Status = "0";
             logininfor.Msg = "登录成功";
             AddLoginInfo(logininfor);
-            SysUserService.UpdateLoginInfo(loginBody.LoginIP, user.UserId);
+            SysUserService.UpdateLoginInfo(loginBody.LoginIP, user.userId);
             return user;
         }
         /// <summary>

Services/Base/SysPermissionService.cs

@@ -56,7 +56,7 @@ namespace Services
             }
             else
             {
-                roles.AddRange(SysRoleService.SelectUserRoleKeys(user.UserId));
+                roles.AddRange(SysRoleService.SelectUserRoleKeys(user.userId));
             }
             return roles;
         }
@@ -76,7 +76,7 @@ namespace Services
             }
             else
             {
-                perms.AddRange(SysMenuService.SelectMenuPermsByUserId(user.UserId));
+                perms.AddRange(SysMenuService.SelectMenuPermsByUserId(user.userId));
             }
             return perms;
         }

Services/Base/SysUserPostService.cs

@@ -20,7 +20,7 @@ namespace Services
             List<SysUserPost> list = new();
             foreach (var item in user.PostIds)
             {
-                list.Add(new SysUserPost() { PostId = item, UserId = user.UserId });
+                list.Add(new SysUserPost() { PostId = item, UserId = user.userId });
             }
             InsertRange(list);
         }

Services/Base/SysUserRoleService.cs

@@ -63,7 +63,7 @@ namespace Services
         public List<SysUser> GetSysUsersByRoleId(long roleId)
         {
             return Context.Queryable<SysUserRole, SysUser>((t1, u) => new JoinQueryInfos(
-                   JoinType.Left, t1.UserId == u.UserId))
+                   JoinType.Left, t1.UserId == u.userId))
                 .WithCache(60 * 10)
                 .Where((t1, u) => t1.RoleId == roleId && u.DelFlag == "0")
                 .Select((t1, u) => u)
@@ -78,11 +78,11 @@ namespace Services
         public PagedInfo<SysUser> GetSysUsersByRoleId(RoleUserQueryDto roleUserQueryDto)
         {
             var query = Context.Queryable<SysUserRole, SysUser>((t1, u) => new JoinQueryInfos(
-                JoinType.Left, t1.UserId == u.UserId))
+                JoinType.Left, t1.UserId == u.userId))
                 .Where((t1, u) => t1.RoleId == roleUserQueryDto.RoleId && u.DelFlag == "0");
             if (!string.IsNullOrEmpty(roleUserQueryDto.UserName))
             {
-                query = query.Where((t1, u) => u.Username.Contains(roleUserQueryDto.UserName));
+                query = query.Where((t1, u) => u.username.Contains(roleUserQueryDto.UserName));
             }
             return query.Select((t1, u) => u).ToPage(roleUserQueryDto);
         }
@@ -96,8 +96,8 @@ namespace Services
         {
             var query = Context.Queryable<SysUser>()
                 .Where(it => it.DelFlag == "0")
-                .Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == it.UserId && s.RoleId == roleUserQueryDto.RoleId).NotAny())
-                .WhereIF(roleUserQueryDto.UserName.IsNotEmpty(), it => it.Username.Contains(roleUserQueryDto.UserName));
+                .Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == it.userId && s.RoleId == roleUserQueryDto.RoleId).NotAny())
+                .WhereIF(roleUserQueryDto.UserName.IsNotEmpty(), it => it.username.Contains(roleUserQueryDto.UserName));
 
             return query.ToPage(roleUserQueryDto);
         }
@@ -113,7 +113,7 @@ namespace Services
             List<SysUserRole> userRoles = new();
             foreach (var item in user.RoleIds)
             {
-                userRoles.Add(new SysUserRole() { RoleId = item, UserId = user.UserId });
+                userRoles.Add(new SysUserRole() { RoleId = item, UserId = user.userId });
             }
 
             return userRoles.Count > 0 ? AddUserRole(userRoles) : 0;

Services/Base/SysUserService.cs

@@ -20,15 +20,18 @@ namespace Services
     public class SysUserService : BaseService<SysUser>, ISysUserService
     {
         private readonly ISysRoleService RoleService;
+        private readonly ISysPostService PostService;
         private readonly ISysUserRoleService UserRoleService;
         private readonly ISysUserPostService UserPostService;
 
         public SysUserService(
             ISysRoleService sysRoleService,
+            ISysPostService sysPostService,
             ISysUserRoleService userRoleService,
             ISysUserPostService userPostService)
         {
             RoleService = sysRoleService;
+            PostService = sysPostService;
             UserRoleService = userRoleService;
             UserPostService = userPostService;
         }
@@ -40,21 +43,26 @@ namespace Services
         public PagedInfo<SysUser> SelectUserList(SysUserQueryDto user, PagerInfo pager)
         {
             var exp = Expressionable.Create<SysUser>();
-            exp.AndIF(!string.IsNullOrEmpty(user.username), u => u.Username.Contains(user.username));
-            exp.AndIF(!string.IsNullOrEmpty(value: user.nickname), u => u.Username.Contains(user.nickname));
-            exp.AndIF(!string.IsNullOrEmpty(user.name), u => u.Username.Contains(user.name));
-            exp.AndIF(!string.IsNullOrEmpty(user.phone), u => u.Username.Contains(user.phone));
+            exp.AndIF(!string.IsNullOrEmpty(user.username), u => u.username.Contains(user.username));
+            exp.AndIF(!string.IsNullOrEmpty(value: user.nickname), u => u.username.Contains(user.nickname));
+            exp.AndIF(!string.IsNullOrEmpty(user.name), u => u.username.Contains(user.name));
+            exp.AndIF(!string.IsNullOrEmpty(user.phone), u => u.username.Contains(user.phone));
             exp.And(u => u.DelFlag == "0");
             var query = Queryable()
-                .LeftJoin<SysDept>((u, dept) => u.DeptId == dept.DeptId)
                 .Where(exp.ToExpression())
-                .Select((u, dept) => new SysUser
-                {
-                    UserId = u.UserId.SelectAll(),
-                    Name = dept.Name,
-                });
+                .OrderByDescending(m => m.userId);
+
+            PagedInfo<SysUser> result = query.ToPage(pager);
+            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));
 
-            return query.ToPage(pager);
+                List<long> userPost = UserPostService.GetList(m => m.UserId == sub.userId).Select(m => m.PostId).ToList();
+                sub.PostList = PostService.GetList(m => userPost.Contains(m.PostId));
+            }
+
+            return result;
         }
 
         /// <summary>
@@ -65,7 +73,7 @@ namespace Services
         public SysUser SelectUserById(long userId)
         {
             var user = Queryable().Filter(null, true).WithCache(60 * 5)
-                .Where(f => f.UserId == userId).First();
+                .Where(f => f.userId == userId).First();
             // if (user != null && user.UserId > 0)
             // {
             //     user.Roles = RoleService.SelectUserRoleListByUserId(userId);
@@ -81,7 +89,7 @@ namespace Services
         /// <returns></returns>
         public string CheckUserNameUnique(string userName)
         {
-            int count = Count(it => it.Username == userName);
+            int count = Count(it => it.username == userName);
             if (count > 0)
             {
                 return UserConstants.NOT_UNIQUE;
@@ -96,9 +104,11 @@ namespace Services
         /// <returns></returns>
         public SysUser InsertUser(SysUser sysUser)
         {
+            sysUser.CreateTime = DateTime.Now;
+            sysUser.UpdateTime = DateTime.Now;
             var result = UseTran(() =>
             {
-                sysUser.UserId = Insertable(sysUser).ExecuteReturnIdentity();
+                sysUser.userId = Insertable(sysUser).ExecuteReturnIdentity();
                 //新增用户角色信息
                 UserRoleService.InsertUserRole(sysUser);
                 //新增用户岗位信息
@@ -118,7 +128,7 @@ namespace Services
         /// <returns></returns>
         public int UpdateUser(SysUser user)
         {
-            var roleIds = RoleService.SelectUserRoles(user.UserId);
+            var roleIds = RoleService.SelectUserRoles(user.userId);
             var diffArr = roleIds.Where(c => !((IList)user.RoleIds).Contains(c)).ToArray();
             var diffArr2 = user.RoleIds.Where(c => !((IList)roleIds).Contains(c)).ToArray();
             bool result = UseTran2(() =>
@@ -126,12 +136,12 @@ namespace Services
                 if (diffArr.Length > 0 || diffArr2.Length > 0)
                 {
                     //删除用户与角色关联
-                    UserRoleService.DeleteUserRoleByUserId((int)user.UserId);
+                    UserRoleService.DeleteUserRoleByUserId((int)user.userId);
                     //新增用户与角色关联
                     UserRoleService.InsertUserRole(user);
                 }
                 // 删除用户与岗位关联
-                UserPostService.Delete(user.UserId);
+                UserPostService.Delete(user.userId);
                 // 新增用户与岗位管理
                 UserPostService.InsertUserPost(user);
                 ChangeUser(user);
@@ -142,16 +152,7 @@ namespace Services
         public int ChangeUser(SysUser user)
         {
             user.UpdateTime = DateTime.Now;
-            return Update(user, t => new
-            {
-                t.Nickname,
-                t.Email,
-                t.Phone,
-                t.DeptId,
-                t.PostIds,
-                t.UpdateBy,
-                t.UpdateTime
-            }, true);
+            return Update(user, true);
         }
 
         /// <summary>
@@ -162,7 +163,7 @@ namespace Services
         /// <returns></returns>
         public int ResetPwd(long userid, string password)
         {
-            return Update(new SysUser() { UserId = userid, Password = password }, it => new { it.Password }, f => f.UserId == userid);
+            return Update(new SysUser() { userId = userid, password = password }, it => new { it.password }, f => f.userId == userid);
         }
 
         /// <summary>
@@ -173,7 +174,7 @@ namespace Services
         public int ChangeUserStatus(SysUser user)
         {
             CheckUserAllowed(user);
-            return Update(user, it => new { it.DelFlag }, f => f.UserId == user.UserId);
+            return Update(user, it => new { it.DelFlag }, f => f.userId == user.userId);
         }
 
         /// <summary>
@@ -183,12 +184,12 @@ namespace Services
         /// <returns></returns>
         public int DeleteUser(long userid)
         {
-            CheckUserAllowed(new SysUser() { UserId = userid });
+            CheckUserAllowed(new SysUser() { userId = userid });
             //删除用户与角色关联
             UserRoleService.DeleteUserRoleByUserId((int)userid);
             // 删除用户与岗位关联
             UserPostService.Delete(userid);
-            return Update(new SysUser() { UserId = userid, DelFlag = "2" }, it => new { it.DelFlag }, f => f.UserId == userid);
+            return Update(new SysUser() { userId = userid, DelFlag = "2" }, it => new { it.DelFlag }, f => f.userId == userid);
         }
 
         /// <summary>
@@ -198,7 +199,7 @@ namespace Services
         /// <returns></returns>
         public int UpdatePhoto(SysUser user)
         {
-            return Update(user, it => new { it.Avatar }, f => f.UserId == user.UserId); ;
+            return Update(user, it => new { it.avatar }, f => f.userId == user.userId); ;
         }
 
         /// <summary>
@@ -222,16 +223,16 @@ namespace Services
             SysUser user = new()
             {
                 CreateTime = DateTime.Now,
-                Username = dto.Username,
-                Nickname = dto.Username,
-                Password = password,
-                DeptId = 0,
+                username = dto.Username,
+                nickname = dto.Username,
+                password = password,
+                deptId = 0,
             };
             if (UserConstants.NOT_UNIQUE.Equals(CheckUserNameUnique(dto.Username)))
             {
                 throw new CustomException($"保存用户{dto.Username}失败，注册账号已存在");
             }
-            user.UserId = Insertable(user).ExecuteReturnIdentity();
+            user.userId = Insertable(user).ExecuteReturnIdentity();
             return user;
         }
 
@@ -256,7 +257,7 @@ namespace Services
         {
             if (!SysUser.IsAdmin(loginUserId))
             {
-                SysUser user = new SysUser() { UserId = userid };
+                SysUser user = new SysUser() { userId = userid };
 
                 //TODO 判断用户是否有数据权限
             }
@@ -273,14 +274,14 @@ namespace Services
             {
                 x.CreateTime = DateTime.Now;
                 x.DelFlag = "0";
-                x.Password = "E10ADC3949BA59ABBE56E057F20F883E";
+                x.password = "E10ADC3949BA59ABBE56E057F20F883E";
             });
             var x = Context.Storageable(users)
                 .SplitInsert(it => !it.Any())
-                .SplitIgnore(it => it.Item.Username == GlobalConstant.AdminRole)
-                .SplitError(x => x.Item.Username.IsEmpty(), "用户名不能为空")
-                .SplitError(x => !Tools.CheckUserName(x.Item.Username), "用户名不符合规范")
-                .WhereColumns(it => it.Username)//如果不是主键可以这样实现（多字段it=>new{it.x1,it.x2}）
+                .SplitIgnore(it => it.Item.username == GlobalConstant.AdminRole)
+                .SplitError(x => x.Item.username.IsEmpty(), "用户名不能为空")
+                .SplitError(x => !Tools.CheckUserName(x.Item.username), "用户名不符合规范")
+                .WhereColumns(it => it.username)//如果不是主键可以这样实现（多字段it=>new{it.x1,it.x2}）
                 .ToStorage();
             var result = x.AsInsertable.ExecuteCommand();//插入可插入部分;
 
@@ -297,11 +298,11 @@ namespace Services
             //输出错误信息               
             foreach (var item in x.ErrorList)
             {
-                Console.WriteLine("userName为" + item.Item.Username + " : " + item.StorageMessage);
+                Console.WriteLine("userName为" + item.Item.username + " : " + item.StorageMessage);
             }
             foreach (var item in x.IgnoreList)
             {
-                Console.WriteLine("userName为" + item.Item.Username + " : " + item.StorageMessage);
+                Console.WriteLine("userName为" + item.Item.username + " : " + item.StorageMessage);
             }
 
             return (msg, x.ErrorList, x.IgnoreList);
@@ -314,7 +315,7 @@ namespace Services
         /// <returns></returns>
         public SysUser Login(LoginBodyDto user)
         {
-            return GetFirst(it => it.Username == user.username && it.Password.ToLower() == user.password.ToLower());
+            return GetFirst(it => it.username == user.username && it.password.ToLower() == user.password.ToLower());
         }
 
         /// <summary>