diff --git a/Src/Dlhis.Basic/Organization/Controllers/FactorySettingController.cs b/Src/Dlhis.Basic/Organization/Controllers/FactorySettingController.cs index 985c0a40..3495f1b1 100644 --- a/Src/Dlhis.Basic/Organization/Controllers/FactorySettingController.cs +++ b/Src/Dlhis.Basic/Organization/Controllers/FactorySettingController.cs @@ -31,7 +31,7 @@ public class FactorySettingController : ControllerBase [IgnoreTenant] public async Task> GetListAsync() { - return await _factorySettingService.GetListAsync(); + return await _factorySettingService.GetListAsync(true); } /// @@ -53,6 +53,6 @@ public class FactorySettingController : ControllerBase [HttpGet("single")] public async Task GetFactorySettingAsync([Required(ErrorMessage = "厂区不可为空")] string factory) { - return await _factorySettingService.GetFactorySettingAsync(factory); + return await _factorySettingService.GetFactorySettingAsync(factory, false); } } \ No newline at end of file diff --git a/Src/Dlhis.Basic/Organization/Services/IFactorySettingService.cs b/Src/Dlhis.Basic/Organization/Services/IFactorySettingService.cs index 4d5bd54e..f37f7803 100644 --- a/Src/Dlhis.Basic/Organization/Services/IFactorySettingService.cs +++ b/Src/Dlhis.Basic/Organization/Services/IFactorySettingService.cs @@ -5,9 +5,9 @@ namespace Dlhis.Basic.Organization.Services; public interface IFactorySettingService : IScopeDependency { - Task> GetListAsync(); + Task> GetListAsync(bool usePermission); Task SaveAsync(FactorySettingSaveRequest request); - Task GetFactorySettingAsync(string factory); + Task GetFactorySettingAsync(string factory, bool usePermission); } \ No newline at end of file diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs index 61c132ab..104d2fdb 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs @@ -23,9 +23,9 @@ public class FactorySettingService : IFactorySettingService _tenantApi = tenantApi; } - public async Task> GetListAsync() + public async Task> GetListAsync(bool usePermission) { - return await GetFactorySettingsAsync(); + return await GetFactorySettingsAsync(null, usePermission); } public async Task SaveAsync(FactorySettingSaveRequest request) @@ -47,9 +47,10 @@ public class FactorySettingService : IFactorySettingService } } - public async Task GetFactorySettingAsync(string factory) + + public async Task GetFactorySettingAsync(string factory, bool usePermission) { - var settings = await GetFactorySettingsAsync(factory); + var settings = await GetFactorySettingsAsync(factory, usePermission); var setting = settings.FirstOrDefault() ?? new FactorySettingResponse(); setting.UserQrCodeExpiration ??= 60; @@ -68,7 +69,7 @@ public class FactorySettingService : IFactorySettingService //************************************************************************************************************************************************************ - private async Task> GetFactorySettingsAsync(string factory = null) + private async Task> GetFactorySettingsAsync(string factory, bool usePermission) { List factories; @@ -79,7 +80,14 @@ public class FactorySettingService : IFactorySettingService } else { - factories = await _tenantApi.GetTenantsInternalAsync(); + if (usePermission) + { + factories = await _tenantApi.GetMyTenantsAsync(); + } + else + { + factories = await _tenantApi.GetTenantsInternalAsync(); + } } var factoryCodes = factories.Where(x => x.PCode.IsPresent()).Select(x => x.Code).ToList(); diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs index f7fc4a4d..3e5eeb16 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs @@ -358,7 +358,7 @@ public class GainfoFaceService : IGainfoFaceService private async Task DetectFaceImageQualityAsync(string base64Image, string factory = null) { var currentFactory = factory ?? _currentUser.GetStringTenantId(); - var factorySetting = await _factorySettingService.GetFactorySettingAsync(currentFactory); + var factorySetting = await _factorySettingService.GetFactorySettingAsync(currentFactory, false); if (factorySetting.FaceImageDetection.Enable) { List r; diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs index bf7fde4a..1f1cc33b 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs @@ -119,7 +119,7 @@ public class GainfoOutsourceService : IGainfoOutsourceService .Select(x => new { x.Id, x.Code, x.Factory, x.CreateTime }) .ToListAsync(); - var settings = await _factorySettingService.GetListAsync(); + var settings = await _factorySettingService.GetListAsync(false); //0001/1/1 0:00:00 var nullDateTime = new DateTime(1, 1, 1); diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoQrCodeService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoQrCodeService.cs index d47cb578..8921c4ef 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoQrCodeService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoQrCodeService.cs @@ -43,7 +43,7 @@ public class GainfoQrCodeService : IGainfoQrCodeService await _dbContext.InsertAsync(gainfoQrCode); } - var setting = await _factorySettingService.GetFactorySettingAsync(factory); + var setting = await _factorySettingService.GetFactorySettingAsync(factory, false); if (gainfoQrCode.ModifiedTime.AddMinutes(setting.UserQrCodeExpiration!.Value) >= now && !isNeedRefresh) { return gainfoQrCode.QrCode;