|
@@ -102,7 +102,7 @@ public class UserController : BaseController
|
|
|
{
|
|
|
var (total, items) = await _userRepository.Queryable(includeDeleted: true)
|
|
|
.Includes(d => d.Account)
|
|
|
- .Includes(d=>d.Roles)
|
|
|
+ .Includes(d => d.Roles)
|
|
|
.Includes(d => d.Organization)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
|
d => d.Name.Contains(dto.Keyword!) || d.PhoneNo.Contains(dto.Keyword!))
|
|
@@ -298,7 +298,7 @@ public class UserController : BaseController
|
|
|
[HttpPost("initial-pwd/{userId}")]
|
|
|
public async Task InitialPassword(string userId)
|
|
|
{
|
|
|
- var account = await _accountRepository.GetAsync(_sessionContext.RequiredUserId, HttpContext.RequestAborted);
|
|
|
+ var account = await _accountRepository.GetAsync(userId, HttpContext.RequestAborted);
|
|
|
if (account == null)
|
|
|
throw UserFriendlyException.SameMessage("无效账号编号");
|
|
|
await _accountDomainService.InitialPasswordAsync(account, HttpContext.RequestAborted);
|