Browse Source

部分BUG处理,登录信息是否管理员,涉案人员,涉案人员导出

dev_wp
wangping 3 months ago
parent
commit
848fd84f84
  1. 2
      src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs
  2. 8
      src/2.services/ATS.NonCustodial.Application/Impl/Business/AppEarlyWarningService.cs
  3. 5
      src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/Auth/Output/AuthLoginOutput.cs
  4. 5
      src/5.shared/ATS.NonCustodial.Shared/Common/Auth/ClaimAttributes.cs
  5. 5
      src/5.shared/ATS.NonCustodial.Shared/Common/Auth/IUser.cs
  6. 18
      src/5.shared/ATS.NonCustodial.Shared/Common/Auth/User.cs

2
src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs

@ -416,6 +416,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins
new Claim(ClaimAttributes.phone,user?.Phone??""),
new Claim(ClaimAttributes.logtime,timeLogin),
new Claim(ClaimAttributes.limits,limits),
new Claim(ClaimAttributes.IsAdmin,user.IsAdmin?"true":"false"),
new Claim(ClaimAttributes.personType,user?.ChatPersonType.ToString()!)
});
@ -484,6 +485,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins
await _appUserRepository.UpdateAsync(user);
}
var authLoginOutput = Mapper.Map<AuthLoginOutput>(user);
authLoginOutput.IsAdmin = isAdmin.IsAdmin;
var token = await GetToken(authLoginOutput);

8
src/2.services/ATS.NonCustodial.Application/Impl/Business/AppEarlyWarningService.cs

@ -412,7 +412,13 @@ namespace ATS.NonCustodial.Application.Impl.Business
/// <returns></returns>
private async Task<IQueryable<AppEarlyWarning>> GetExpression(AppEarlyWarningGetPageInput pageInput, IQueryable<AppEarlyWarning?> query)
{
var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync();
var limits = User.limits;
var IsAdmin = User.IsAdmin;
var selectLimits = await _appCaseSupervisorRepository.AsQueryable(false, true)
.WhereIf((!IsAdmin),w => limits.Contains(w.UnitId.ToString()))
.ToListAsync();
var caseIds = selectLimits.Select(w => w.CaseId).Distinct().ToList();
//var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync();
query = query.Where(w => caseIds.Contains(w.CaseId))
.WhereIf(pageInput.KeyWord.NotNull(), w => w.Title.Contains(pageInput.KeyWord) || w.CaseName.Contains(pageInput.KeyWord))

5
src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/Auth/Output/AuthLoginOutput.cs

@ -80,5 +80,10 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Admins.Auth.Output
/// 查询界限
/// </summary>
public string? limits { get; set; }
/// <summary>
/// 是否是Admin
/// </summary>
public bool IsAdmin { get; set; }
}
}

5
src/5.shared/ATS.NonCustodial.Shared/Common/Auth/ClaimAttributes.cs

@ -91,5 +91,10 @@ namespace ATS.NonCustodial.Shared.Common.Auth
/// 查询界限
/// </summary>
public const string limits = "limits";
/// <summary>
/// 是否是Admin
/// </summary>
public const string IsAdmin = "false";
}
}

5
src/5.shared/ATS.NonCustodial.Shared/Common/Auth/IUser.cs

@ -57,6 +57,11 @@ namespace ATS.NonCustodial.Shared.Common.Auth
/// </summary>
string limits { get; }
/// <summary>
/// 是否管理员
/// </summary>
bool IsAdmin { get; }
/// <summary>
/// 租户Id
/// </summary>

18
src/5.shared/ATS.NonCustodial.Shared/Common/Auth/User.cs

@ -176,6 +176,24 @@ namespace ATS.NonCustodial.Shared.Common.Auth
}
}
/// <summary>
/// 是否管理员
/// </summary>
public bool IsAdmin
{
get
{
var name = _accessor?.HttpContext?.User?.FindFirst(ClaimAttributes.IsAdmin);
if (name != null && name.Value.NotNull())
{
return name.Value=="true";
}
return false;
}
}
/// <summary>
/// 租户Id
/// </summary>

Loading…
Cancel
Save