From da40fc3a0f30e4e523de537fa6247db6e61ed1a3 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 9 Jan 2025 12:18:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9D=83=E9=99=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DevicePermissionAnalyzeService.cs | 2 +- Src/Dlhis.Basic/Organization/Dto/GainfoDto.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs index 833f0f32..65f7d99a 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs @@ -287,7 +287,7 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService AssignType = p.Key.AssignType, AssignValue = p.Key.AssignValue, UniqueType = p.Key.UniqueType, - Codes = p.SelectMany(xx => xx.Codes).ToList(), + Codes = p.SelectMany(xx => xx.Codes.Where(xxx => analyzePack.DeviceCodes.Contains(xxx))).ToList(), OriginalCodes = p.Where(xx => xx.OriginalCodes.IsPresent()).SelectMany(xx => xx.OriginalCodes).ToList() }).ToList() }; diff --git a/Src/Dlhis.Basic/Organization/Dto/GainfoDto.cs b/Src/Dlhis.Basic/Organization/Dto/GainfoDto.cs index 7ea91257..0b378beb 100644 --- a/Src/Dlhis.Basic/Organization/Dto/GainfoDto.cs +++ b/Src/Dlhis.Basic/Organization/Dto/GainfoDto.cs @@ -32,8 +32,7 @@ public class AnalyzePackDto public IEnumerable UserGainfoGroupCodes { get; set; } public IEnumerable DeviceCodes { get; set; } - - + public DeviceAssignmentTypeEnumType? IgnoreUniqueType { get; set; } public string IgnoreAssignValue { get; set; }