Skip to content

Commit

Permalink
Fix Data Service (#131)
Browse files Browse the repository at this point in the history
Fosol authored Mar 29, 2024
1 parent f935bb3 commit 29662ca
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/libs/dal/Services/ServerItemService.cs
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ public IEnumerable<ServerItem> Find(ServerItemFilter filter, bool includeRelated
.Include(si => si.OperatingSystemItem);

query = query
.Where(si => si.InstallStatus == 1)
.Where(filter.GeneratePredicate())
.Distinct();

@@ -64,7 +63,6 @@ join t in this.Context.Tenants on ut.TenantId equals t.Id

var query = (from si in this.Context.ServerItems
where si.TenantId != null
&& si.InstallStatus == 1
&& (userTenants.Contains(si.TenantId!.Value) || userOrganizationQuery.Contains(si.OrganizationId))
select si);

@@ -95,7 +93,6 @@ join t in this.Context.Tenants on ut.TenantId equals t.Id
public IEnumerable<ServerItemListModel> FindList(ServerItemFilter filter)
{
var query = this.Context.ServerItems
.Where(si => si.InstallStatus == 1)
.Where(filter.GeneratePredicate())
.Distinct();

@@ -129,7 +126,6 @@ join t in this.Context.Tenants on ut.TenantId equals t.Id

var query = (from si in this.Context.ServerItems
where si.TenantId != null
&& si.InstallStatus == 1
&& (userTenants.Contains(si.TenantId!.Value) || userOrganizationQuery.Contains(si.OrganizationId))
select si)
.Where(filter.GeneratePredicate())

0 comments on commit 29662ca

Please sign in to comment.