From e0335104be43c31b86085384d64429ca8f66ee46 Mon Sep 17 00:00:00 2001
From: cjy <tiankui_xing@163.com>
Date: Thu, 22 Aug 2024 15:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=80=E5=B1=9E=E4=B8=9A=E5=8A=A1=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs       | 5 +++++
 ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs        | 7 +++++++
 ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs | 6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs
index b49b8349..3d735ce5 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs
@@ -1230,6 +1230,11 @@ public class SeaExportReq
     /// 航线人员名称 
     /// </summary>
     public string Laner { get; set; }
+
+    /// <summary>
+    /// 所属业务部门名称 
+    /// </summary>
+    public string SaleDeptName { get; set; }
 }
 
 /// <summary>
diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
index 42f44bff..dcfc0c9b 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
@@ -1613,4 +1613,11 @@ public class SeaExport : BaseOrgModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "航线人员名称", IsNullable = true, Length = 100)]
     public string Laner { get; set; }
+
+
+    /// <summary>
+    /// 所属业务部门名称 
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "所属业务部门名称", IsNullable = true, Length = 100)]
+    public string SaleDeptName { get; set; }
 }
\ No newline at end of file
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
index 74479ebd..b16df67b 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
@@ -83,10 +83,10 @@ public partial class SeaExportService : ISeaExportService
         var result = tenantDb.Queryable<SeaExport>()
             .InnerJoin<BusinessFeeStatus>((a, b) => a.Id == b.BusinessId)
             //.LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
-            .LeftJoin<SysOrg>((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org")
-            .Select((a, b, c) => new SeaExportRes()
+            //.LeftJoin<SysOrg>((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org")
+            .Select((a, b) => new SeaExportRes()
             {
-                SaleDeptName = c.OrgName,
+                //SaleDeptName = c.OrgName,
             },
                 true)//true表示 其余字段自动映射，根据字段名字
                      //.Select<SeaExportRes>()