Forráskód Böngészése

😁1、修复更新用户方法逻辑 2、代码优化调整

zuohuaijun 2 éve
szülő
commit
2c8c6003ce

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -107,7 +107,7 @@ public class SysAuthService : IDynamicApiController, ITransient
             }
         }
 
-        // 清空用户的密码错误次数
+        // 登录成功则清空密码错误次数
         _sysCacheService.Remove(keyErrorPasswordCount);
 
         return await CreateToken(user);

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -113,8 +113,7 @@ public class SysUserService : IDynamicApiController, ITransient
     [DisplayName("更新用户")]
     public async Task UpdateUser(UpdateUserInput input)
     {
-        var user = await _sysUserRep.AsQueryable().ClearFilter().FirstAsync(u => u.Account == input.Account && u.Id != input.Id);
-        if (user != null)
+        if (await _sysUserRep.AsQueryable().ClearFilter().AnyAsync(u => u.Account == input.Account && u.Id != input.Id))
             throw Oops.Oh(ErrorCodeEnum.D1003);
 
         await _sysUserRep.AsUpdateable(input.Adapt<SysUser>()).IgnoreColumns(true)
@@ -126,6 +125,7 @@ public class SysUserService : IDynamicApiController, ITransient
         SqlSugarFilter.DeleteUserOrgCache(input.Id, _sysUserRep.Context.CurrentConnectionConfig.ConfigId.ToString());
 
         // 若账号的角色和组织架构发生变化,则强制账号下线以刷新权限
+        var user = await _sysUserRep.AsQueryable().ClearFilter().FirstAsync(u => u.Id == input.Id);
         var roleIds = await GetOwnRoleList(input.Id); // 获取权限集合
         if (input.OrgId != user.OrgId || input.RoleIdList != roleIds)
             await _sysOnlineUserService.ForceOffline(input.Id);

+ 3 - 0
Admin.NET/Admin.NET.Core/Util/ComputerUtil.cs

@@ -220,6 +220,9 @@ public static class ComputerUtil
     }
 }
 
+/// <summary>
+/// IP信息
+/// </summary>
 public class IpCnResp
 {
     public string Ip { get; set; }