wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🗃️SysUser表新增字段

Browse Source
This commit is contained in:
不做码农 2023-09-27 18:37:44 +08:00
parent d0158f0eef
commit eca2d2fd73
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
View File

@ -172,7 +172,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{ {
return ToResponse(ResultCode.CAPTCHA_ERROR, "验证码错误"); return ToResponse(ResultCode.CAPTCHA_ERROR, "验证码错误");
} }
dto.UserIP = HttpContext.GetClientUserIp();
SysUser user = sysUserService.Register(dto); SysUser user = sysUserService.Register(dto);
if (user.UserId > 0) if (user.UserId > 0)
{ {

1
ZR.ServiceCore/Model/Dto/RegisterDto.cs
View File

@ -30,5 +30,6 @@ namespace ZR.Model.System.Dto
/// 头像 /// 头像
/// </summary> /// </summary>
public string Photo { get; set; } public string Photo { get; set; }
public string UserIP { get; set; }
} }
} }

7
ZR.ServiceCore/Model/SysUser.cs
View File

@ -1,8 +1,4 @@
using MiniExcelLibs.Attributes; using MiniExcelLibs.Attributes;
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
namespace ZR.Model.System namespace ZR.Model.System
{ {
@ -82,7 +78,8 @@ namespace ZR.Model.System
/// </summary> /// </summary>
[SugarColumn(DefaultValue = "0")] [SugarColumn(DefaultValue = "0")]
public long DeptId { get; set; } public long DeptId { get; set; }
public string Province { get; set; }
public string City { get; set; }
#region 表额外字段 #region 表额外字段
public bool IsAdmin() public bool IsAdmin()
{ {

39
ZR.ServiceCore/Services/SysUserService.cs
View File

@ -1,11 +1,7 @@
using Infrastructure; using Infrastructure;
using Infrastructure.Attribute; using Infrastructure.Attribute;
using Infrastructure.Extensions; using IPTools.Core;
using SqlSugar;
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic;
using System.Linq;
using ZR.Common; using ZR.Common;
using ZR.Model; using ZR.Model;
using ZR.Model.System; using ZR.Model.System;
@ -125,19 +121,22 @@ namespace ZR.Service
var roleIds = RoleService.SelectUserRoles(user.UserId); var roleIds = RoleService.SelectUserRoles(user.UserId);
var diffArr = roleIds.Where(c => !((IList)user.RoleIds).Contains(c)).ToArray(); var diffArr = roleIds.Where(c => !((IList)user.RoleIds).Contains(c)).ToArray();
var diffArr2 = user.RoleIds.Where(c => !((IList)roleIds).Contains(c)).ToArray(); var diffArr2 = user.RoleIds.Where(c => !((IList)roleIds).Contains(c)).ToArray();
bool result = UseTran2(() =>
if (diffArr.Length > 0 || diffArr2.Length > 0)
{ {
//删除用户与角色关联 if (diffArr.Length > 0 || diffArr2.Length > 0)
UserRoleService.DeleteUserRoleByUserId((int)user.UserId); {
//新增用户与角色关联 //删除用户与角色关联
UserRoleService.InsertUserRole(user); UserRoleService.DeleteUserRoleByUserId((int)user.UserId);
} //新增用户与角色关联
// 删除用户与岗位关联 UserRoleService.InsertUserRole(user);
UserPostService.Delete(user.UserId); }
// 新增用户与岗位管理 // 删除用户与岗位关联
UserPostService.InsertUserPost(user); UserPostService.Delete(user.UserId);
return ChangeUser(user); // 新增用户与岗位管理
UserPostService.InsertUserPost(user);
ChangeUser(user);
});
return result ? 1 : 0;
} }
public int ChangeUser(SysUser user) public int ChangeUser(SysUser user)
@ -222,7 +221,7 @@ namespace ZR.Service
} }
//密码md5 //密码md5
string password = NETCore.Encrypt.EncryptProvider.Md5(dto.Password); string password = NETCore.Encrypt.EncryptProvider.Md5(dto.Password);
var ip_info = IpTool.Search(dto.UserIP);
SysUser user = new() SysUser user = new()
{ {
Create_time = DateTime.Now, Create_time = DateTime.Now,
@ -231,7 +230,9 @@ namespace ZR.Service
Password = password, Password = password,
Status = 0, Status = 0,
DeptId = 0, DeptId = 0,
Remark = "用户注册" Remark = "用户注册",
Province = ip_info.Province,
City = ip_info.City
}; };
if (UserConstants.NOT_UNIQUE.Equals(CheckUserNameUnique(dto.Username))) if (UserConstants.NOT_UNIQUE.Equals(CheckUserNameUnique(dto.Username)))
{ {