From 5209c062f85ce64e627697bc2ec08654160c7fb2 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 6 Aug 2024 11:27:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=83=A8=E9=97=A8=E5=88=86=E9=85=8D?= =?UTF-8?q?=E6=9D=83=E9=99=90,=E4=BA=BA=E5=91=98=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DevicePermissionService.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index c263924a..1875e9ed 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -539,8 +539,17 @@ public class DevicePermissionService : IDevicePermissionService //Department var tenantDepartmentNos = permissions.Where(x => x.AssignType == AssignTypeEnumType.Department) - .GroupBy(x => x.TenantId) - .ToDictionary(x => x.Key, x => x.Select(item => item.AssignValue).Distinct().ToList()); + .Where(x => x.AssignValue.Contains(':')) + .Select(x => + { + var arr = x.AssignValue.Split(':'); + return new + { + Factory = arr[0], DepartmentNo = arr[1] + }; + }) + .GroupBy(x => x.Factory) + .ToDictionary(x => x.Key, x => x.Select(p => p.DepartmentNo).Distinct().ToList()); var departments = await _dbContext.Queryable().ToListAsync(); var gainfoByDeptWhere = LinqExpressionExtensions.False();