|
|
|
@ -41,8 +41,8 @@ namespace Myshipping.Core.Service
|
|
|
|
|
[HttpGet("/DjyCustomer/page")]
|
|
|
|
|
public async Task<dynamic> Page([FromQuery] QueryDjyCustomerInput input)
|
|
|
|
|
{
|
|
|
|
|
List<long> userlist = await DataFilterExtensions.GetDataScopeIdList();
|
|
|
|
|
var entities = await _rep.AsQueryable()
|
|
|
|
|
.Where(m => m.CreatedUserId == UserManager.UserId)
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.CodeName), u => u.CodeName.Contains(input.CodeName.Trim()))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.ShortName), u => u.ShortName.Contains(input.ShortName.Trim()))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.FullName), u => u.FullName.Contains(input.FullName.Trim()))
|
|
|
|
@ -65,6 +65,7 @@ namespace Myshipping.Core.Service
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.USDBank), u => u.USDBank.Contains(input.USDBank.Trim()))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.USDAccount), u => u.USDAccount.Contains(input.USDAccount.Trim()))
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.ShortName.Contains(input.SearchValue.Trim()) || u.CodeName.Contains(input.SearchValue.Trim()))
|
|
|
|
|
.Where(u => userlist.Contains((long)u.CreatedUserId))
|
|
|
|
|
.ToPagedListAsync(input.PageNo, input.PageSize);
|
|
|
|
|
return entities.XnPagedResult();
|
|
|
|
|
}
|
|
|
|
@ -171,7 +172,21 @@ namespace Myshipping.Core.Service
|
|
|
|
|
// return await _rep.ToListAsync();
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 下拉筛选
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="keyword">关键字</param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet("/DjyCustomer/Suggest")]
|
|
|
|
|
public async Task<dynamic> Suggest(string keyword)
|
|
|
|
|
{
|
|
|
|
|
List<long> userlist = await DataFilterExtensions.GetDataScopeIdList();
|
|
|
|
|
var entities = await _rep.AsQueryable().Filter(null, true)
|
|
|
|
|
.Where(x => x.TenantId == UserManager.TENANT_ID)
|
|
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(keyword), u => u.CodeName.Contains(keyword) || u.ShortName.Contains(keyword))
|
|
|
|
|
.ToPagedListAsync(1, 10);
|
|
|
|
|
return entities.XnPagedResult();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|