相关bug调整

This commit is contained in:
fuenmao
2026-08-24 16:36:47 +08:00
parent 22a7df5bec
commit 0931e1f343
6 changed files with 57 additions and 9 deletions
@@ -5,6 +5,11 @@ namespace SimpleAdmin.Application;
/// </summary>
public class OnboardingCompanyPageInput : BasePageInput
{
/// <summary>
/// 公司业务编码。
/// </summary>
public virtual string CompanyCode { get; set; }
/// <summary>
/// 公司名称。
/// </summary>
@@ -11,9 +11,8 @@ public class OnboardingCompanyService : DbRepository<ObCompany>, IOnboardingComp
public async Task<SqlSugarPagedList<ObCompany>> Page(OnboardingCompanyPageInput input)
{
return await Context.Queryable<ObCompany>()
.WhereIF(
!string.IsNullOrWhiteSpace(input.CompanyName),
it => it.CompanyName.Contains(input.CompanyName) || it.CompanyCode.Contains(input.CompanyName))
.WhereIF(!string.IsNullOrWhiteSpace(input.CompanyCode), it => it.CompanyCode.Contains(input.CompanyCode))
.WhereIF(!string.IsNullOrWhiteSpace(input.CompanyName), it => it.CompanyName.Contains(input.CompanyName))
.WhereIF(!string.IsNullOrWhiteSpace(input.Status), it => it.Status == input.Status)
.OrderByIF(!string.IsNullOrWhiteSpace(input.SortField), $"{input.SortField} {input.SortOrder}")
.OrderBy(it => it.CreateTime)