|
|
|
@ -538,8 +538,11 @@ namespace ATS.NonCustodial.Application.Impl.Admins |
|
|
|
/// <param name="input"></param> |
|
|
|
/// <param name="input"></param> |
|
|
|
/// <returns></returns> |
|
|
|
/// <returns></returns> |
|
|
|
public async Task<IResultOutput> UpdateAsync(UserUpdateInput input) |
|
|
|
public async Task<IResultOutput> UpdateAsync(UserUpdateInput input) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if(!input.PhoneUpdateFlag.HasValue() || input.PhoneUpdateFlag != "1") |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!(await IsAdmin(User.Id)).IsAdmin) return ResultOutput.NotOk("无操作权限"); |
|
|
|
if (!(await IsAdmin(User.Id)).IsAdmin) return ResultOutput.NotOk("无操作权限"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!(input?.Id > 0)) return ResultOutput.NotOk(); |
|
|
|
if (!(input?.Id > 0)) return ResultOutput.NotOk(); |
|
|
|
var user = await _userRepository.FindAsync(input.Id); |
|
|
|
var user = await _userRepository.FindAsync(input.Id); |
|
|
|
@ -920,20 +923,20 @@ namespace ATS.NonCustodial.Application.Impl.Admins |
|
|
|
/// <returns></returns> |
|
|
|
/// <returns></returns> |
|
|
|
public async Task<ResultOutput<List<KeyValueDto>>> GetUserSelectList(int isCourt = 0) |
|
|
|
public async Task<ResultOutput<List<KeyValueDto>>> GetUserSelectList(int isCourt = 0) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var userRoles = await this.IsAdmin(null); |
|
|
|
// var userRoles = await this.IsAdmin(null); |
|
|
|
|
|
|
|
|
|
|
|
var dataDict = await _appDictionaryService.GetListNoApiAsync("job_position"); |
|
|
|
// var dataDict = await _appDictionaryService.GetListNoApiAsync("job_position"); |
|
|
|
|
|
|
|
|
|
|
|
// 安全地处理可能的空值 |
|
|
|
// 安全地处理可能的空值 |
|
|
|
var codeList = dataDict?.FirstOrDefault()?.Dictionaries? |
|
|
|
// var codeList = dataDict?.FirstOrDefault()?.Dictionaries? |
|
|
|
.Where(w => w.Code == (isCourt == 0 ? "inquisitor" : "judge")) |
|
|
|
// .Where(w => w.Code == (isCourt == 0 ? "inquisitor" : "judge")) |
|
|
|
.ToList() ?? new List<DictionaryGetOutput>(); |
|
|
|
// .ToList() ?? new List<DictionaryGetOutput>(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var rtn = await _userRepository.AsQueryable(false, true) |
|
|
|
var rtn = await _userRepository.AsQueryable(false, true) |
|
|
|
.Where(w => w.ChatPersonType != ChatPersonTypeEnum.SupervisedPerson && w.DataStatus != DataStatusEnum.Disable && !w.UserName.Contains("_aks")) |
|
|
|
.Where(w => w.ChatPersonType != ChatPersonTypeEnum.SupervisedPerson && w.DataStatus != DataStatusEnum.Disable && !w.UserName.Contains("_aks")) |
|
|
|
.WhereIf(codeList.Count > 0, w => w.PositionId == codeList.FirstOrDefault().Id) |
|
|
|
// .WhereIf(codeList.Count > 0, w => w.PositionId == codeList.FirstOrDefault().Id) |
|
|
|
// .WhereIf(!userRoles.IsAdmin, w => w.Id == User.Id) 2025 -10-20 段肖确认修改 |
|
|
|
// .WhereIf(!userRoles.IsAdmin, w => w.Id == User.Id) 2025 -10-20 段肖确认修改 |
|
|
|
.Select(w => new KeyValueDto() |
|
|
|
.Select(w => new KeyValueDto() |
|
|
|
{ |
|
|
|
{ |
|
|
|
|