diff --git a/Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs b/Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs index 6a628341..fbb5d558 100644 --- a/Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs +++ b/Src/Dlhis.Basic/Common/ApiLog/Controller/ApiLogController.cs @@ -11,7 +11,7 @@ namespace Dlhis.Basic.Common.ApiLog.Controller; /// /// API日志控制器 /// -[Authorize] +[Authorize(Roles = "admin")] [Route("api/[controller]")] [ApiController] public class ApiLogController : ControllerBase diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs index 0c26af6c..e0edfb2f 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs @@ -67,7 +67,9 @@ public class GainfoFaceService : IGainfoFaceService public async Task GetPageAsync(GainfoFacePageRequest request) { + var tenantIds = _currentUser.GetUserClaim("tenants").Split(",").ToList(); var factories = request.Factories; + factories = factories.Where(x => tenantIds.Contains(x)).ToList(); var userCodes = await _dbContext.Queryable().Where(x => factories.Contains(x.Factory)).Select(x => x.Code).ToListAsync(); var existsFaceCodes = await _faceDbContext.Queryable().Where(x => userCodes.Contains(x.UserCode)).Select(x => x.UserCode).ToListAsync(); diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/IdentityUserSyncService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/IdentityUserSyncService.cs index 1202760e..5bde9773 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/IdentityUserSyncService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/IdentityUserSyncService.cs @@ -34,6 +34,7 @@ public class IdentityUserSyncService : IIdentityUserSyncService NormalizedUserName = userName.ToUpper(), ConcurrencyStamp = Guid.NewGuid().ToString(), SecurityStamp = Guid.NewGuid().ToString(), + LockoutEnabled = true }; password = hasher.HashPassword(user, password); user.PasswordHash = password; diff --git a/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs b/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs index f65869f2..8a7121bd 100644 --- a/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs +++ b/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs @@ -11,6 +11,7 @@ namespace Dlhis.Sys.Identity.Controllers; /// /// 用户 /// +[Authorize] [Route("api/[controller]")] [ApiController] public class UsersController : ControllerBase diff --git a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs index 6525ca36..fb58d5d8 100644 --- a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs +++ b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs @@ -116,6 +116,7 @@ public class UserService : IUserService NormalizedUserName = request.Username.ToUpper(), ConcurrencyStamp = Guid.NewGuid().ToString(), SecurityStamp = Guid.NewGuid().ToString(), + LockoutEnabled = true }; request.Password = hasher.HashPassword(user, request.Password); user.PasswordHash = request.Password;