diff --git a/Myshipping.Application/Service/EmailParserServerManage/EmailParserConfigService.cs b/Myshipping.Application/Service/EmailParserServerManage/EmailParserConfigService.cs index aaf6d3f6..08a8f71b 100644 --- a/Myshipping.Application/Service/EmailParserServerManage/EmailParserConfigService.cs +++ b/Myshipping.Application/Service/EmailParserServerManage/EmailParserConfigService.cs @@ -371,9 +371,9 @@ namespace Myshipping.Application try { - var parList = _emailExcuteCodeInjectConfigInfoRepository.AsQueryable() - .WhereIF(!string.IsNullOrWhiteSpace(queryItem),inj => - inj.INJECT_CODE.Contains(queryItem)|| inj.INJECT_NAME.Contains(queryItem)|| inj.INJECT_FULLNAME.Contains(queryItem)) + var parList = _emailExcuteCodeInjectConfigInfoRepository.AsQueryable().Filter(null, true) + .WhereIF(!string.IsNullOrWhiteSpace(queryItem), inj => + inj.INJECT_CODE.Contains(queryItem) || inj.INJECT_NAME.Contains(queryItem) || inj.INJECT_FULLNAME.Contains(queryItem)) .OrderBy(inj => inj.INJECT_NAME) .ToList(); diff --git a/Myshipping.Application/Service/EmailParserServerManage/EmailUserAccountService.cs b/Myshipping.Application/Service/EmailParserServerManage/EmailUserAccountService.cs index f1d71e4f..b7c28f38 100644 --- a/Myshipping.Application/Service/EmailParserServerManage/EmailUserAccountService.cs +++ b/Myshipping.Application/Service/EmailParserServerManage/EmailUserAccountService.cs @@ -393,7 +393,7 @@ namespace Myshipping.Application try { - var parList = _emailParserConfigInfoRepository.AsQueryable() + var parList = _emailParserConfigInfoRepository.AsQueryable().Filter(null, true) .InnerJoin((par, inj) => par.INJECT_ID == inj.GID) .WhereIF(!string.IsNullOrWhiteSpace(queryItem), (par, inj) => par.PARSER_CODE.Contains(queryItem) || par.PARSER_NAME.Contains(queryItem) || inj.INJECT_CODE.Contains(queryItem)