diff --git a/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs b/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs index e9f31c56..64a43edd 100644 --- a/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs +++ b/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs @@ -9,7 +9,7 @@ namespace Dlhis.Basic.Api { [Auth] [Get("/api/businessplacepermissions/getPlaces")] - Task>> GetPlaceByUserIdAsync(int userId); + Task>> GetPlaceByUserIdAsync(); [Auth] [Post("/api/businessplacepermissions/savePlace")] diff --git a/Src/Dlhis.Basic.Api/Request/SaveBusinessPlacePermissionRequest.cs b/Src/Dlhis.Basic.Api/Request/SaveBusinessPlacePermissionRequest.cs index f1f62866..084b595e 100644 --- a/Src/Dlhis.Basic.Api/Request/SaveBusinessPlacePermissionRequest.cs +++ b/Src/Dlhis.Basic.Api/Request/SaveBusinessPlacePermissionRequest.cs @@ -10,11 +10,6 @@ namespace Dlhis.Basic.Api.Request { public long? Id { get; set; } - /// - /// 管理人员 - /// - public int ManagerUserId { get; set; } - /// /// 营业点 /// diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs index 8a34f65f..05c8003e 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs @@ -25,12 +25,12 @@ namespace Dlhis.Basic.BusinessPlace.Controllers /// /// 根据用户获取管理点 /// - /// + /// /// [HttpGet("getPlaces")] - public async Task> GetPlaceByUserIdAsync(int userId) + public async Task> GetPlaceByUserIdAsync() { - return await _businessPlacePermissionsService.GetPlaceByUserIdAsync(userId); + return await _businessPlacePermissionsService.GetPlaceByUserIdAsync(); } diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/SaveBusinessPlacePermissionRequest.cs b/Src/Dlhis.Basic/BusinessPlace/Request/SaveBusinessPlacePermissionRequest.cs index d5b7d7ed..d0ab51f1 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/SaveBusinessPlacePermissionRequest.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Request/SaveBusinessPlacePermissionRequest.cs @@ -6,11 +6,6 @@ namespace Dlhis.Basic.BusinessPlace.Request { public long? Id { get; set; } - /// - /// 管理人员 - /// - public int ManagerUserId { get; set; } - /// /// 营业点 /// diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs index cdc7d5d6..7268363f 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs @@ -6,6 +6,6 @@ namespace Dlhis.Basic.BusinessPlace.Services { Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request); - Task> GetPlaceByUserIdAsync(int userId); + Task> GetPlaceByUserIdAsync(); } } diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs index 44f100ae..52161922 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs @@ -1,5 +1,6 @@ using Dlhis.Basic.BusinessPlace.Request; using Dlhis.Entity.Basic.Entity; +using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Services; using Mapster; @@ -9,6 +10,7 @@ namespace Dlhis.Basic.BusinessPlace.Services.Implements { private readonly IDbContext _dbContext; private readonly IBusinessPlaceService _businessPlaceService; + private readonly ICurrentUser _currentUser; public BusinessPlacePermissionsService(IDbContext dbContext, IBusinessPlaceService businessPlaceService) { @@ -16,8 +18,9 @@ namespace Dlhis.Basic.BusinessPlace.Services.Implements _businessPlaceService = businessPlaceService; } - public async Task> GetPlaceByUserIdAsync(int userId) + public async Task> GetPlaceByUserIdAsync() { + var userId = _currentUser.GetIntSubjectId(); return await _dbContext.Queryable() .Where(x => x.ManagerUserId == userId) .Select(x => x.BusinessPlaceCode) @@ -26,7 +29,8 @@ namespace Dlhis.Basic.BusinessPlace.Services.Implements public async Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request) { - if(request.Id.HasValue) + var userId = _currentUser.GetIntSubjectId(); + if (request.Id.HasValue) { var entity =await _dbContext.Queryable() .Where(x => x.Id == request.Id).FirstAsync(); @@ -36,10 +40,9 @@ namespace Dlhis.Basic.BusinessPlace.Services.Implements else { var entity = request.Adapt(); + entity.ManagerUserId = userId; await _dbContext.InsertAsync(entity); } } - - } }