|
|
|
@ -120,7 +120,7 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
var data = await tenantDb.Queryable<InfoClient>()
|
|
|
|
|
.InnerJoin<InfoClientTag>((a, b) => a.Id == b.ClientId)
|
|
|
|
|
.Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsController == true)
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey))
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey) || a.Description.Contains(queryKey))
|
|
|
|
|
.Select((a, b) => new ControllerClientRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
@ -1219,7 +1219,7 @@ public class ClientCommonService : IClientCommonService
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(code) && code == "shipagency", (a, b) => b.IsShipAgency == true)
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(code) && code == "enterprise", (a, b) => b.IsEnterprise == true)
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(code) && code == "contract", (a, b) => b.IsContract == true)
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey))
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey) || a.Description.Contains(queryKey))
|
|
|
|
|
.Select((a, b) => new ClientSelectRes
|
|
|
|
|
{
|
|
|
|
|
Id = a.Id,
|
|
|
|
|