diff --git a/ds-wms-service/DS.WMS.Core/HangfireJob/Method/JobCommonService.cs b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/JobCommonService.cs index 8b0e5b4e..0611382f 100644 --- a/ds-wms-service/DS.WMS.Core/HangfireJob/Method/JobCommonService.cs +++ b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/JobCommonService.cs @@ -118,7 +118,7 @@ namespace DS.WMS.Core.HangfireJob.Method } else { - return tenantDb.Queryable().First(x => x.AccountType == type); + return tenantDb.Queryable().First(x => x.AccountType == type && x.IsCompany == true); } } else @@ -133,7 +133,7 @@ namespace DS.WMS.Core.HangfireJob.Method } else { - return tenantDb.Queryable().First(x => x.AccountType == type); + return tenantDb.Queryable().First(x => x.AccountType == type && x.IsCompany == true); } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs index b1b131f7..c47e447c 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs @@ -482,7 +482,7 @@ namespace DS.WMS.Core.Op.Method } else { - return tenantDb.Queryable().First(x => x.AccountType == type); + return tenantDb.Queryable().First(x => x.AccountType == type && x.IsCompany == true); } } else @@ -497,7 +497,7 @@ namespace DS.WMS.Core.Op.Method } else { - return tenantDb.Queryable().First(x => x.AccountType == type); + return tenantDb.Queryable().First(x => x.AccountType == type && x.IsCompany == true); } }