From d083ee3cc2f80efb1de87364717c0b360db5e3d9 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Thu, 18 Jan 2024 16:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmailParserServerManage/EmailParserConfigService.cs | 6 +++--- .../EmailParserServerManage/EmailUserAccountService.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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)