fix 操作人
This commit is contained in:
@@ -224,7 +224,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
await _dbContext.InsertAsync(settlementSupplierMonthlies);
|
await _dbContext.InsertAsync(settlementSupplierMonthlies);
|
||||||
}
|
}
|
||||||
|
|
||||||
[AllowAnonymous]
|
//[AllowAnonymous]
|
||||||
[Transactional]
|
[Transactional]
|
||||||
[IgnoreTenant]
|
[IgnoreTenant]
|
||||||
[HttpPost("settlement/supplier/pay")]
|
[HttpPost("settlement/supplier/pay")]
|
||||||
@@ -261,7 +261,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
await _dbContext.InsertAsync(newData);
|
await _dbContext.InsertAsync(newData);
|
||||||
}
|
}
|
||||||
|
|
||||||
[AllowAnonymous]
|
//[AllowAnonymous]
|
||||||
[IgnoreTenant]
|
[IgnoreTenant]
|
||||||
[HttpPost("settlement/supplier/refund")]
|
[HttpPost("settlement/supplier/refund")]
|
||||||
public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest2 request)
|
public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest2 request)
|
||||||
@@ -314,7 +314,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
{
|
{
|
||||||
var userIds = page.Data.Select(x => x.CreatedBy).Distinct().ToList();
|
var userIds = page.Data.Select(x => x.CreatedBy).Distinct().ToList();
|
||||||
var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds });
|
var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds });
|
||||||
page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreatedBy)?.OperatorName);
|
page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreatedBy)?.OperatorName ?? "系统自动");
|
||||||
}
|
}
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
@@ -323,7 +323,6 @@ public class AssignmentsController : ControllerBase
|
|||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
[AllowAnonymous]
|
|
||||||
[IgnoreTenant]
|
[IgnoreTenant]
|
||||||
[HttpGet("settlement/supplier/originPage")]
|
[HttpGet("settlement/supplier/originPage")]
|
||||||
public async Task<Pagination<SettlementSupplierPageResponse>> GetSettlementSupplierOriginPageAsync([FromQuery] SettlementSupplierPageRequest request)
|
public async Task<Pagination<SettlementSupplierPageResponse>> GetSettlementSupplierOriginPageAsync([FromQuery] SettlementSupplierPageRequest request)
|
||||||
@@ -339,7 +338,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
{
|
{
|
||||||
var userIds = page.Data.Select(x => x.CreatedBy).Distinct().ToList();
|
var userIds = page.Data.Select(x => x.CreatedBy).Distinct().ToList();
|
||||||
var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds });
|
var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds });
|
||||||
page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreatedBy)?.OperatorName);
|
page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreatedBy)?.OperatorName ?? "系统自动");
|
||||||
}
|
}
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user