diff --git a/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs index 356aec3e..2b6b9ecf 100644 --- a/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs @@ -3,6 +3,7 @@ using Dlhis.Basic.Places.Request; using Dlhis.Basic.Places.Response; using Dlhis.Entity.Basic.Entity; using Dlhis.Sys.Api; +using Dlhis.Sys.Api.Request; using Kurisu.AspNetCore.Authentication.Abstractions; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; @@ -35,9 +36,15 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService }) .ToPageListAsync(request); - var users = await _userApi.GetUserByIdsAsync(page.Data.Select(x => x.UserId).Distinct().ToList()); - - page.Data.ForEach(item => { item.UserName = users.FirstOrDefault(x => x.Id == item.UserId)?.UserName; }); + try + { + var users = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = page.Data.Select(x => x.UserId).Distinct().ToList() }); + page.Data.ForEach(item => { item.UserName = users.FirstOrDefault(x => x.Id == item.UserId)?.UserName; }); + } + catch (Exception e) + { + //ignore + } return page; } diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index a58a7e73..f2a49d8a 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs @@ -4,6 +4,7 @@ using Dlhis.Entity.Device.Enums; using Dlhis.ScheduledTask.TaskAssignment.Request; using Dlhis.ScheduledTask.TaskAssignment.Response; using Dlhis.Sys.Api; +using Dlhis.Sys.Api.Request; using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; @@ -91,7 +92,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService try { var userIds = page.Data.Select(x => x.CreateBy).Distinct().ToList(); - var userInfos = await _userApi.GetUserByIdsAsync(userIds); + var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds }); page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName); } catch (Exception e) diff --git a/Src/Dlhis.Sys.Api/IUserApi.cs b/Src/Dlhis.Sys.Api/IUserApi.cs index e4047070..96ad0853 100644 --- a/Src/Dlhis.Sys.Api/IUserApi.cs +++ b/Src/Dlhis.Sys.Api/IUserApi.cs @@ -1,4 +1,5 @@ -using Dlhis.Sys.Api.Response; +using Dlhis.Sys.Api.Request; +using Dlhis.Sys.Api.Response; using Kurisu.RemoteCall.Attributes; namespace Dlhis.Sys.Api; @@ -13,5 +14,5 @@ public interface IUserApi [Auth] [Post("/api/users/by-ids")] - Task> GetUserByIdsAsync(List ids); + Task> GetUserByIdsAsync(IdsRequest request); } \ No newline at end of file diff --git a/Src/Dlhis.Sys.Api/Request/IdsRequest.cs b/Src/Dlhis.Sys.Api/Request/IdsRequest.cs new file mode 100644 index 00000000..269c53c6 --- /dev/null +++ b/Src/Dlhis.Sys.Api/Request/IdsRequest.cs @@ -0,0 +1,6 @@ +namespace Dlhis.Sys.Api.Request; + +public class IdsRequest +{ + public List Ids { get; set; } +} \ No newline at end of file diff --git a/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs b/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs index 8a7121bd..a6076353 100644 --- a/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs +++ b/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs @@ -59,9 +59,9 @@ public class UsersController : ControllerBase [Authorize] [HttpPost("by-ids")] - public async Task> GetUserByIdsAsync(List ids) + public async Task> GetUserByIdsAsync(IdsRequest request) { - return await _userService.GetUserByIdsAsync(ids); + return await _userService.GetUserByIdsAsync(request.Ids); } /// diff --git a/Src/Dlhis.Sys/Identity/Request/IdRequest.cs b/Src/Dlhis.Sys/Identity/Request/IdRequest.cs index 27eb7b1a..d8cf70f2 100644 --- a/Src/Dlhis.Sys/Identity/Request/IdRequest.cs +++ b/Src/Dlhis.Sys/Identity/Request/IdRequest.cs @@ -4,3 +4,9 @@ public class IdRequest { public int? Id { get; set; } } + + +public class IdsRequest +{ + public List Ids { get; set; } +}