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

refactor 优化代码

Browse Source
This commit is contained in:
liguoyang
2024-11-26 15:26:12 +08:00
parent a32910f0d9
commit 623a5c4e49
88 changed files with 1820 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
View File

@@ -33,9 +33,9 @@ public class DeviceGroupService : IDeviceGroupService
public async Task<List<DeviceGroupTreeResponse>> GetTreeAsync(DeviceTypeEnumType type)
{
var tenantResult = await _tenantApi.GetMyTenantsAsync();
var tenantIds = tenantResult.Data.Select(x => x.Code).ToList();
tenantIds.AddRange(tenantResult.Data.Select(x => x.PCode));
var tenants = await _tenantApi.GetMyTenantsAsync();
var tenantIds = tenants.Select(x => x.Code).ToList();
tenantIds.AddRange(tenants.Select(x => x.PCode));
var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>()
.Where(x => tenantIds.Contains(x.TenantId))

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

@@ -379,8 +379,7 @@ public class DevicePermissionService : IDevicePermissionService
.Where(x => x.num == 1)
.ToListAsync();
var tenantsResult = await _tenantApi.GetTenantsInternalAsync();
var tenants = tenantsResult.Data;
var tenants = await _tenantApi.GetTenantsInternalAsync();
page.Data.ForEach(x =>
{

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

@@ -246,8 +246,8 @@ public class DeviceService : IDeviceService
var factory = device.TenantId;
try
{
var tenantResult = await _tenantApi.GetTenantByCodeAsync(device.TenantId);
factory = tenantResult?.Data?.Name ?? string.Empty;
var tenant = await _tenantApi.GetTenantByCodeAsync(device.TenantId);
factory = tenant?.Name ?? string.Empty;
}
catch (Exception)
{