海运出口跨库查询

ds-wms-service/DS.Module.SqlSugar/SaasDbService.cs

@@ -136,6 +136,8 @@ public class SaasDbService : ISaasDbService
             };
 
             dbProvider.Aop.OnDiffLogEvent = (it) => { };
+            //全局过滤租户Id
+            dbProvider.QueryFilter.AddTableFilter<ITenantId>(m => m.TenantId ==long.Parse(user.TenantId));
             //全局过滤机构Id
             dbProvider.QueryFilter.AddTableFilter<IOrgId>(m => m.OrgId == user.GetOrgId());
             //全局软删除过滤

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs

@@ -1227,4 +1227,13 @@ public class SeaExportRes
     /// 国内发货人    t_info_client CUSTNAME
     /// </summary>
     public string ShipperCn { get; set; }
+
+    /// <summary>
+    /// 所属分部名称
+    /// </summary>
+    public string SaleOrgName { get; set; }
+    /// <summary>
+    /// 所属部门名称
+    /// </summary>
+    public string SaleDeptName { get; set; }
 }

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -328,11 +328,21 @@ public partial class SeaExportService : ISeaExportService
     public async Task<DataResult<SeaExportListRes>> GetListByPage(PageRequest request)
     {
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+
+        var orgList = db.Queryable<SysOrg>().Where(x => x.Status == StatusEnum.Enable);
         //序列化查询条件
         var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
         var result = tenantDb.Queryable<SeaExport>()
             .InnerJoin<BusinessFeeStatus>((a, b) => a.Id == b.BusinessId)
-            .Select<SeaExportRes>()
+            .LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
+            .LeftJoin<SysOrg>((a, b, c, d) => a.SaleOrgId == d.Id, "shippingweb8_dev.sys_org")
+            .Select((a, b, c, d) => new SeaExportRes()
+            {
+                SaleOrgName = c.OrgName,
+                SaleDeptName  = d.OrgName,
+            },
+                true)//true表示 其余字段自动映射，根据字段名字
+            //.Select<SeaExportRes>()
             .MergeTable()
             .Mapper(it =>
             {