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

fix -2

Browse Source
This commit is contained in:
liguoyang
2024-12-26 15:47:18 +08:00
parent fa1d46b197
commit 588c1ff0a7
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissionService.cs
View File

@@ -103,8 +103,9 @@ public class GainfoPermissionService : IGainfoPermissionService
page.Data.ForEach(item =>
{
var permission = permissions.First(x => x.Tenant == item.Factory);
var permission = permissions.FirstOrDefault(x => x.Tenant == item.Factory);
if (permission != null)
{
item.Source = new DevicePermissionSourceDto
{
Factory = item.Factory,
@@ -112,7 +113,7 @@ public class GainfoPermissionService : IGainfoPermissionService
{
var codeDesc = x.UniqueType == DeviceAssignmentTypeEnumType.Device
? item.DeployPlace
: deviceGroups.First(p => p.Code == x.OriginalCodes.First()).Name;
: deviceGroups.FirstOrDefault(p => p.Code == x.OriginalCodes.First())?.Name;
var currentAssignValue = x.AssignValue;
@@ -138,6 +139,7 @@ public class GainfoPermissionService : IGainfoPermissionService
return r;
})
};
}
});
return page;