From cc9312140204d9b810d9ad2ce53077b972774b53 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 7 Feb 2025 14:32:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8E=92=E9=99=A4=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=E7=94=A8=E4=BA=BA=E5=91=98=E7=9A=84=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DevicePermissionAnalyzeService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs index 24e1b8e6..defeba13 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs @@ -122,13 +122,14 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService internalIgnoreAssignTypes.Add(AssignTypeEnumType.Tenant); } + var excludes = new[] { GainfoUserTypeEnumType.Outsource, GainfoUserTypeEnumType.External }; var analyzePack = new AnalyzePackDto { UserNo = gainfo.No, UserDepartment = gainfo.DepartmentNo, UserFactory = gainfo.Factory, UserGainfoGroupCodes = gainfoGroupRelationships.Where(x => x.UserNo == gainfo.No).Select(x => x.GroupCode), - DeviceCodes = devices.WhereIf(gainfo.Type == GainfoUserTypeEnumType.Outsource, x => x.Type != DeviceTypeEnumType.Meal).Select(x => x.Code), //外包人员不允许餐饮 + DeviceCodes = devices.WhereIf(excludes.Contains(gainfo.Type), x => x.Type != DeviceTypeEnumType.Meal).Select(x => x.Code), //不允许餐饮 IgnoreAssignValue = ignoreAssignValue, IgnoreAssignTypes = internalIgnoreAssignTypes, IgnoreUniqueType = ignoreUniqueType