diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/SMSService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/SMSService.cs index cd373d8..0286cc7 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/SMSService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/SMSService.cs @@ -209,7 +209,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins var random = new Random(); var code = random.Next(100000, 999999).ToString(); var name = "新用户注册"; - var sendMessage = $"您的验证码为:{code},请于五分钟内填写,若非本人操作,请勿泄露。"; + var sendMessage = $"您的验证码为:{code},请于5分钟内填写,若非本人操作,请勿泄露。"; // 创建验证码记录 var addSMS = new AppSMS @@ -375,7 +375,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins try { - var smsConfig = LazyGetRequiredService(); + // var smsConfig = LazyGetRequiredService(); var signName = await GetDictionariesOutput("sms_config", "SignName"); var feeType = await GetDictionariesOutput("sms_config", "FeeType"); var baseUrl = await GetDictionariesOutput("sms_config", "BaseUrl"); @@ -384,17 +384,17 @@ namespace ATS.NonCustodial.Application.Impl.Admins var parameters = new SmsParameters() { - Pwd = pwd.Value ?? smsConfig.Pwd, + Pwd = pwd.Value, Content = content, - FeeType = feeType.Value ?? smsConfig.FeeType, - LoginName = loginName.Value ?? smsConfig.LoginName, - SignName = signName.Value ?? smsConfig.SignName, + FeeType = feeType.Value, + LoginName = loginName.Value, + SignName = signName.Value, Mobile = phone }; // 构建查询字符串 var queryString = BuildQueryString(parameters); - var requestUrl = $"{baseUrl.Value ?? smsConfig.BaseUrl}?{queryString}"; + var requestUrl = $"{baseUrl.Value}?{queryString}"; // 发送HTTP GET请求 var response = await _httpClient.GetAsync(requestUrl); diff --git a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/UserService.cs b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/UserService.cs index 84b5ac3..198bd74 100644 --- a/src/2.services/ATS.NonCustodial.Application/Impl/Admins/UserService.cs +++ b/src/2.services/ATS.NonCustodial.Application/Impl/Admins/UserService.cs @@ -539,7 +539,10 @@ namespace ATS.NonCustodial.Application.Impl.Admins /// public async Task UpdateAsync(UserUpdateInput input) { - if (!(await IsAdmin(User.Id)).IsAdmin) return ResultOutput.NotOk("无操作权限"); + if(!input.PhoneUpdateFlag.HasValue() || input.PhoneUpdateFlag != "1") + { + if (!(await IsAdmin(User.Id)).IsAdmin) return ResultOutput.NotOk("无操作权限"); + } if (!(input?.Id > 0)) return ResultOutput.NotOk(); var user = await _userRepository.FindAsync(input.Id); @@ -920,20 +923,20 @@ namespace ATS.NonCustodial.Application.Impl.Admins /// public async Task>> 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? - .Where(w => w.Code == (isCourt == 0 ? "inquisitor" : "judge")) - .ToList() ?? new List(); + // var codeList = dataDict?.FirstOrDefault()?.Dictionaries? + // .Where(w => w.Code == (isCourt == 0 ? "inquisitor" : "judge")) + // .ToList() ?? new List(); var rtn = await _userRepository.AsQueryable(false, true) .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 段肖确认修改 .Select(w => new KeyValueDto() { diff --git a/src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/User/Input/UserUpdateInput.cs b/src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/User/Input/UserUpdateInput.cs index 1e1452b..c3afe64 100644 --- a/src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/User/Input/UserUpdateInput.cs +++ b/src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/User/Input/UserUpdateInput.cs @@ -72,5 +72,10 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Admins.User.Input /// 手机号(手机号限制输入为手机号格式,位数为11位。) /// public string? Phone { get; set; } + + /// + /// 用户修改手机号标识 + /// + public string? PhoneUpdateFlag { get; set; } } } \ No newline at end of file