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 16:05:52 +08:00
parent c1a0293993
commit cbf9a496a9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Dlhis.Basic/Device/Dtos/TenantAssignTypeDeviceCode.cs
View File

@@ -15,7 +15,7 @@ public class TenantAssignTypeDeviceCode
/// <summary>
/// 设备权限
/// </summary>
public IEnumerable<AssignTypeDeviceCode> AssignTypes { get; init; }
public List<AssignTypeDeviceCode> AssignTypes { get; init; }
}
public class AssignTypeDeviceCode
@@ -35,10 +35,10 @@ public class AssignTypeDeviceCode
/// <summary>
/// 权限
/// </summary>
public IEnumerable<Guid> Codes { get; set; }
public List<Guid> Codes { get; set; }
public IEnumerable<Guid> OriginalCodes { get; set; }
public List<Guid> OriginalCodes { get; set; }
}
public class UserTenantDeviceCodeDto

12
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs
View File

@@ -248,9 +248,9 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService
AssignType = p.Key.AssignType,
AssignValue = p.Key.AssignValue,
UniqueType = p.Key.UniqueType,
Codes = p.SelectMany(xx => xx.Codes),
OriginalCodes = p.Where(xx => xx.OriginalCodes.IsPresent()).SelectMany(xx => xx.OriginalCodes)
})
Codes = p.SelectMany(xx => xx.Codes).ToList(),
OriginalCodes = p.Where(xx => xx.OriginalCodes.IsPresent()).SelectMany(xx => xx.OriginalCodes).ToList()
}).ToList()
};
return dto;
@@ -299,8 +299,8 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService
AssignType = xx.Key.AssignType,
AssignValue = xx.Key.AssignValue,
UniqueType = uniqueType,
Codes = xx.Select(xxx => xxx.UniqueValue)
})
Codes = xx.Select(xxx => xxx.UniqueValue).ToList()
}).ToList()
})
.ToList();
@@ -318,7 +318,7 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService
nextItems = nextItems.Distinct().ToList();
assignTypeDeviceCodeItem.OriginalCodes = nextItems;
assignTypeDeviceCodeItem.Codes = deviceGroupRelationships.Where(x => nextItems.Contains(x.GroupCode)).Select(x => x.DeviceCode);
assignTypeDeviceCodeItem.Codes = deviceGroupRelationships.Where(x => nextItems.Contains(x.GroupCode)).Select(x => x.DeviceCode).ToList();
}
}
}