yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 按基地分配获取值错误

Browse Source
This commit is contained in:
liguoyang
2024-03-15 15:13:53 +08:00
parent 8ed8addbf3
commit 4825648e41
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -506,8 +506,8 @@ public class DevicePermissionService : IDevicePermissionService
//按厂区 //按厂区
var dt = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Tenant, gainfo.Factory); var dt = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Tenant, gainfo.Factory);
var gt = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Tenant, gainfo.Factory); var gt = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Tenant, gainfo.Factory);
deviceCodes.AddRange(du); deviceCodes.AddRange(dt);
deviceGroupCodes.AddRange(gu); deviceGroupCodes.AddRange(gt);
var groupCodes = deviceGroupCodes.SelectMany(x => x.Codes).Distinct().ToList(); var groupCodes = deviceGroupCodes.SelectMany(x => x.Codes).Distinct().ToList();
var deveiceCodesByGroup = deviceGroupRelationships.Where(x => groupCodes.Contains(x.GroupCode)).GroupBy(x => x.TenantId) var deveiceCodesByGroup = deviceGroupRelationships.Where(x => groupCodes.Contains(x.GroupCode)).GroupBy(x => x.TenantId)