From 0e38406dd538bcda7636514690bf0415bc47ac71 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 12 Nov 2024 17:40:35 +0800 Subject: [PATCH] test . --- .../Services/Implements/DevicePermissionService.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 9df3c933..3e7f2ce2 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -4,6 +4,7 @@ using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Response; using Dlhis.Basic.Organization.Dto; using Dlhis.Entity.Basic.Entity; +using Dlhis.Entity.Basic.Enums; using Dlhis.Entity.Device.Entities; using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Sys.Entities; @@ -711,12 +712,6 @@ public class DevicePermissionService : IDevicePermissionService return new Dictionary>(); } - var outsourceCodes = await _dbContext.Queryable() - .Where(x => userNos.Contains(x.No)) - .Where(x => SqlFunc.Subqueryable().Where(p => p.Code == x.Code).Any()) - .Select(x => x.Code) - .ToListAsync(); - var enableFactoryPermissions = await _dbContext.Queryable().ToListAsync(); var gainfoGroupRelationships = await _dbContext.Queryable().Where(x => userNos.Contains(x.UserNo)).ToListAsync(); @@ -737,7 +732,7 @@ public class DevicePermissionService : IDevicePermissionService Workplace = gainfo.Workplace, Factory = gainfo.Factory, DepartmentNo = gainfo.DepartmentNo, - IsOutsource = outsourceCodes.Any(x => x == gainfo.Code), + IsOutsource = gainfo.Type == GainfoUserTypeEnumType.Outsource, EnableFactoryPermission = enableFactoryPermissions.FirstOrDefault(x => x.TenantId == gainfo.Factory)?.EnableOutsourceDown ?? true };