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-10-14 11:27:57 +08:00
parent 6afe09baa8
commit 247e0156f9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,7 +400,7 @@ public class DevicePermissionService : IDevicePermissionService
var tenantId = arr.First();
var currentDepartmentNo = arr.Last();
var departmentNos = new List<string> { currentDepartmentNo };
DepartmentRecursionGetPNo(currentDepartmentNo, departments, departmentNos);
DepartmentRecursionGetNext(currentDepartmentNo, departments, departmentNos);
ids.AddRange(await _dbContext.Queryable<GainfoEntity>().Where(x => x.Factory == tenantId && departmentNos.Contains(x.DepartmentNo)).Select(x => x.Id).ToListAsync());
}
@@ -459,13 +459,13 @@ public class DevicePermissionService : IDevicePermissionService
return page;
void DepartmentRecursionGetPNo(string current, List<DepartmentEntity> data, List<string> result)
void DepartmentRecursionGetNext(string current, List<DepartmentEntity> data, List<string> result)
{
var p = data.FirstOrDefault(x => x.No == current)?.PNo;
if (p.IsPresent())
var next = data.Where(x => x.PNo == current);
foreach (var item in next)
{
result.Add(p);
DepartmentRecursionGetPNo(p, data, result);
result.Add(item.No);
DepartmentRecursionGetNext(item.No, data, result);
}
}
}