From 27ba504441037666e787ded85b4af2f65be65c17 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 29 4月 2025 18:06:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
index 386b78d..841bdba 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsAreaRepository.cs
@@ -26,6 +26,7 @@
return await (await GetDbSetAsync())
.IncludeDetails()
.OrderBy(t => t.Sort)
+ .Where(x=> !x.IsDeleted)
.FirstOrDefaultAsync(t => t.AreaName == name, GetCancellationToken(cancellationToken));
}
@@ -38,19 +39,22 @@
/// <returns></returns>
public async Task<bool> NameExistAsync(string areaNo, Guid? id = null)
{
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).AnyAsync(x => x.AreaNo == areaNo);
+ return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id)
+ .Where(x => !x.IsDeleted).AnyAsync(x => x.AreaNo == areaNo);
}
/// <inheritdoc />
public async Task<int> GetMaxSortAsync()
{
- var hasAny = await (await GetQueryableAsync()).AnyAsync();
+ var hasAny = await (await GetQueryableAsync())
+ .Where(x => !x.IsDeleted).AnyAsync();
if (!hasAny)
{
return 1;
}
- var sort = await (await GetQueryableAsync()).MaxAsync(x => x.Sort);
+ var sort = await (await GetQueryableAsync())
+ .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
return sort + 1;
}
@@ -62,6 +66,7 @@
.IncludeDetails(includeDetails)
.Where(specification.ToExpression())
.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.AreaNo.Contains(filter))
+ .Where(x => !x.IsDeleted)
.OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsArea.Sort) : sorting)
.PageBy(skipCount, maxResultCount)
.ToListAsync(GetCancellationToken(cancellationToken));
@@ -74,12 +79,13 @@
return await (await GetQueryableAsync())
.Where(specification.ToExpression())
.WhereIf(!filter.IsNullOrWhiteSpace(), u => u.AreaNo.Contains(filter))
+ .Where(x => !x.IsDeleted)
.CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
}
/// <inheritdoc />
public override async Task<IQueryable<WmsArea>> WithDetailsAsync()
{
- return (await GetQueryableAsync()).IncludeDetails();
+ return (await GetQueryableAsync()).Where(x => !x.IsDeleted).IncludeDetails();
}
}
--
Gitblit v1.9.3