diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 6933d695..b8d3db99 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -8958,9 +8958,9 @@ 关键字 - + - 英文名 + 英文名/中文名 diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs index 358ade1b..dbf9aaa5 100644 --- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs +++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs @@ -1585,7 +1585,9 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie var queryList = list .WhereIF(!string.IsNullOrEmpty(input.Name),x=> x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase) - || x.CnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase) ) .WhereIF(!string.IsNullOrEmpty(input.KeyWord), + || x.Code.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase)|| x.CnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase) + ) + .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => (!string.IsNullOrWhiteSpace(x.Code) && x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)) || (!string.IsNullOrWhiteSpace(x.EnName) && x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)) || (!string.IsNullOrWhiteSpace(x.CnName) && x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase))