From eef88f8a7aebe235b629fd5da0114cc4b700271a Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 26 Aug 2024 11:09:36 +0800
Subject: [PATCH] !

---
 DOAN.Service/Factory_Model/BaseCompanyService.cs        | 4 ++--
 DOAN.Service/Factory_Model/BaseDeviceAccountService.cs  | 4 ++--
 DOAN.Service/Factory_Model/BaseProductionLineService.cs | 4 ++--
 DOAN.Service/Factory_Model/BaseWorkshopService.cs       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DOAN.Service/Factory_Model/BaseCompanyService.cs b/DOAN.Service/Factory_Model/BaseCompanyService.cs
index 898d291..0a4ac0a 100644
--- a/DOAN.Service/Factory_Model/BaseCompanyService.cs
+++ b/DOAN.Service/Factory_Model/BaseCompanyService.cs
@@ -73,8 +73,8 @@ namespace DOAN.Service.Factory_Model
         private static Expressionable<BaseCompany> QueryExp(BaseCompanyQueryDto parm)
         {
             var predicate = Expressionable.Create<BaseCompany>()
-                .AndIF(string.IsNullOrEmpty(parm.CompanyCode),it=>it.CompanyCode.Contains(parm.CompanyCode))
-                .AndIF(string.IsNullOrEmpty(parm.CompanyName),it=>it.CompanyName.Contains(parm.CompanyName))
+                .AndIF(!string.IsNullOrEmpty(parm.CompanyCode),it=>it.CompanyCode.Contains(parm.CompanyCode))
+                .AndIF(!string.IsNullOrEmpty(parm.CompanyName),it=>it.CompanyName.Contains(parm.CompanyName))
                 .AndIF(parm.Status>-1,it=>it.Status==parm.Status)
                 .AndIF(parm.IsOutsource > -1,it=>it.IsOutsource == parm.IsOutsource)
 
diff --git a/DOAN.Service/Factory_Model/BaseDeviceAccountService.cs b/DOAN.Service/Factory_Model/BaseDeviceAccountService.cs
index f61a310..4806fef 100644
--- a/DOAN.Service/Factory_Model/BaseDeviceAccountService.cs
+++ b/DOAN.Service/Factory_Model/BaseDeviceAccountService.cs
@@ -74,8 +74,8 @@ namespace DOAN.Service.Factory_Model
         private static Expressionable<BaseDeviceAccount> QueryExp(BaseDeviceAccountQueryDto parm)
         {
             var predicate = Expressionable.Create<BaseDeviceAccount>()
-                .AndIF(string.IsNullOrEmpty(parm.DeviceCode), it => it.DeviceCode.Contains(parm.DeviceCode))
-                .AndIF(string.IsNullOrEmpty(parm.DeviceName), it => it.DeviceName.Contains(parm.DeviceName))
+                .AndIF(!string.IsNullOrEmpty(parm.DeviceCode), it => it.DeviceCode.Contains(parm.DeviceCode))
+                .AndIF(!string.IsNullOrEmpty(parm.DeviceName), it => it.DeviceName.Contains(parm.DeviceName))
                 .AndIF(parm.Status > -1, it => it.Status == parm.Status)
                 .AndIF(parm.FkLineId > -1, it => it.FkLineId == parm.FkLineId)
 
diff --git a/DOAN.Service/Factory_Model/BaseProductionLineService.cs b/DOAN.Service/Factory_Model/BaseProductionLineService.cs
index 68e9d25..5b8ff0c 100644
--- a/DOAN.Service/Factory_Model/BaseProductionLineService.cs
+++ b/DOAN.Service/Factory_Model/BaseProductionLineService.cs
@@ -73,8 +73,8 @@ namespace DOAN.Service.Factory_Model
         private static Expressionable<BaseProductionLine> QueryExp(BaseProductionLineQueryDto parm)
         {
             var predicate = Expressionable.Create<BaseProductionLine>()
-                 .AndIF(string.IsNullOrEmpty(parm.LineCode), it => it.LineCode.Contains(parm.LineCode))
-                .AndIF(string.IsNullOrEmpty(parm.LineName), it => it.LineName.Contains(parm.LineName))
+                 .AndIF(!string.IsNullOrEmpty(parm.LineCode), it => it.LineCode.Contains(parm.LineCode))
+                .AndIF(!string.IsNullOrEmpty(parm.LineName), it => it.LineName.Contains(parm.LineName))
                 .AndIF(parm.Status > -1, it => it.Status == parm.Status)
                 .AndIF(parm.FkWorkshopId > -1, it => it.FkWorkshopId == parm.FkWorkshopId)
 
diff --git a/DOAN.Service/Factory_Model/BaseWorkshopService.cs b/DOAN.Service/Factory_Model/BaseWorkshopService.cs
index 3b35d4f..510c89f 100644
--- a/DOAN.Service/Factory_Model/BaseWorkshopService.cs
+++ b/DOAN.Service/Factory_Model/BaseWorkshopService.cs
@@ -72,8 +72,8 @@ namespace DOAN.Service.Factory_Model
         private static Expressionable<BaseWorkshop> QueryExp(BaseWorkshopQueryDto parm)
         {
             var predicate = Expressionable.Create<BaseWorkshop>()
-                   .AndIF(string.IsNullOrEmpty(parm.WorkshopCode), it => it.WorkshopCode.Contains(parm.WorkshopCode))
-                .AndIF(string.IsNullOrEmpty(parm.WorkshopName), it => it.WorkshopName.Contains(parm.WorkshopName))
+                   .AndIF(!string.IsNullOrEmpty(parm.WorkshopCode), it => it.WorkshopCode.Contains(parm.WorkshopCode))
+                .AndIF(!string.IsNullOrEmpty(parm.WorkshopName), it => it.WorkshopName.Contains(parm.WorkshopName))
                 .AndIF(parm.Status > -1, it => it.Status == parm.Status)
                 .AndIF(parm.FkCompanyId > -1, it => it.FkCompanyId == parm.FkCompanyId)