From 73a602490d0bfb78d491b70b8fd29473c14b5e15 Mon Sep 17 00:00:00 2001
From: cjy <tiankui_xing@163.com>
Date: Fri, 13 Sep 2024 19:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=AF=E8=A7=86=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DS.WMS.Core/Op/Method/SeaExportService.cs    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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 f100da85..a055bc52 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
@@ -96,14 +96,16 @@ public partial class SeaExportService : ISeaExportService
     public async Task<DataResult<SeaExportListRes>> GetListByPage(PageRequest request)
     {
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
-
-        //var query = commonService.GetVisibleDataRuleFilter<SeaExport>(tenantDb);
+        //启用海运出口列表可视数据权限
+        var query = commonService.GetVisibleDataRuleFilter<SeaExport>(tenantDb);
 
         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)
+        //var result = tenantDb.Queryable<SeaExport>()
+        var statusList = tenantDb.Queryable<BookingStatus>().Select<BookingStatusRes>().ToList();
+        var result = query
+           .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) => new SeaExportRes()
@@ -115,9 +117,9 @@ public partial class SeaExportService : ISeaExportService
                      .MergeTable()
                      .Mapper(it =>
                      {
-                         
-                         it.BookingStatus = tenantDb.Queryable<BookingStatus>().Where(x => x.BusinessId == it.Id).Select<BookingStatusRes>().ToList();
-                         
+                         it.BookingStatus = statusList.Where(x => x.BusinessId == it.Id).ToList();
+                         //it.BookingStatus = tenantDb.Queryable<BookingStatus>().Where(x => x.BusinessId == it.Id).Select<BookingStatusRes>().ToList();
+
                      }) 
             .Where(whereList);
         //.ToQueryPageAsync(request.PageCondition);