diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index c91140d0..f8fc04cf 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -34,15 +34,13 @@ public class DeviceService : IDeviceService { var role = _currentUser.GetRole(); var isAll = role is "tenant-admin" or "admin"; - var tenantIds = _currentUser.GetUserClaim("tenants").Split(",").ToList(); var tenantId = _currentUser.GetStringTenantId(); var page = await _dbContext.Queryable() .LeftJoin((d, dt) => d.TemplateCode == dt.Code) .LeftJoin((d, dt, dr) => d.UniqueNo == dr.DeviceUniqueNo) .LeftJoin((d, dt, dr, bp) => dr.BusinessPlaceCode == bp.Code) - .WhereIF(isAll, d => tenantIds.Contains(d.TenantId)) - .WhereIF(!isAll, d => tenantId == d.TenantId) + .WhereIF(isAll, d => tenantId == d.TenantId) .WhereIF(request.Type.HasValue, (d, dt) => d.Type == request.Type) .WhereIF(request.Enable.HasValue, (d, dt) => d.Enable == request.Enable) .WhereIF(request.Search.IsPresent(), d => d.UniqueNo == request.Search || d.DeployPlace.Contains(request.Search))