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-12-11 18:11:37 +08:00
parent fc1a1eee7a
commit 57e4028880
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
View File

@@ -158,7 +158,7 @@ public class GainfoGroupService : IGainfoGroupService
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).ToListAsync(); var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).ToListAsync();
var userTenantDeviceCodes = usersToDelete.IsPresent() && dps.Exists(x => x.AssignType != AssignTypeEnumType.Tenant) var userTenantDeviceCodes = usersToDelete.IsPresent() && dps.Exists(x => x.AssignType != AssignTypeEnumType.Tenant)
? await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(beforeUserNos.Union(presentUserNos).ToList(), null, groupCode.ToString(), AssignTypeEnumType.Group) ? await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(beforeUserNos.Union(presentUserNos).ToList())
: new Dictionary<string, IEnumerable<TenantAssignTypeDeviceCode>>(); : new Dictionary<string, IEnumerable<TenantAssignTypeDeviceCode>>();
var addTasks = new List<DeviceTaskEntity>(); var addTasks = new List<DeviceTaskEntity>();
@@ -167,7 +167,13 @@ public class GainfoGroupService : IGainfoGroupService
{ {
foreach (var item in usersToDelete) foreach (var item in usersToDelete)
{ {
var myDeviceCodes = userTenantDeviceCodes[item].SelectMany(x => x.AssignTypes).SelectMany(x => x.Codes); var permissions = userTenantDeviceCodes[item].ToList();
foreach (var permission in permissions)
{
permission.AssignTypes = permission.AssignTypes.Where(p => !gainfoGroupCodes.Contains(p.AssignValue)).ToList();
}
var myDeviceCodes = permissions.SelectMany(x => x.AssignTypes).SelectMany(x => x.Codes);
if (myDeviceCodes.Any(x => x == device.Code)) if (myDeviceCodes.Any(x => x == device.Code))
{ {
continue; continue;