From f5f4ad1ec5eba239df5519a2a0d04830201196db Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Thu, 8 Aug 2024 13:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BB=E5=8F=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs   | 4 ++--
 .../DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs        | 2 +-
 ds-wms-service/DS.WMS.OpApi/Program.cs                        | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
index d01f9909..0bfef2a6 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs
@@ -3457,7 +3457,7 @@ namespace DS.WMS.Core.Op.Method
                     // 判断是否启用了委托单位查看控制权限
                     bool isEnableCustomerAuthority = false;
 
-                    if (paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
+                    if (!string.IsNullOrWhiteSpace(paramConfig) && paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
                     {
                         isEnableCustomerAuthority = true;
                     }
@@ -3791,7 +3791,7 @@ namespace DS.WMS.Core.Op.Method
                     // 判断是否启用了委托单位查看控制权限
                     bool isEnableCustomerAuthority = false;
 
-                    if (paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
+                    if (!string.IsNullOrWhiteSpace(paramConfig) && paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
                     {
                         isEnableCustomerAuthority = true;
                     }
diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs
index 09917eca..c3ceb123 100644
--- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs
+++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs
@@ -2064,7 +2064,7 @@ namespace DS.WMS.Core.TaskPlat.Method
                 if (orderInfo != null && orderInfo.currOrder != null)
                 {
                     //更新订舱相关内容
-                    if (paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
+                    if (!string.IsNullOrWhiteSpace(paramConfig) && paramConfig.Equals("ENABLE", StringComparison.OrdinalIgnoreCase))
                     {
                         //如果是拆票需要按照分票明细单个发送邮件
                         if (orderInfo.splitOrMergeFlag == 1)
diff --git a/ds-wms-service/DS.WMS.OpApi/Program.cs b/ds-wms-service/DS.WMS.OpApi/Program.cs
index 75a5e117..af24c306 100644
--- a/ds-wms-service/DS.WMS.OpApi/Program.cs
+++ b/ds-wms-service/DS.WMS.OpApi/Program.cs
@@ -39,6 +39,7 @@ builder.Host
 builder.Services.AddAppWebInstal();
 builder.Services.AddCorsInstall();
 builder.Services.AddUserModuleInstall(); //�û�����
+builder.Services.AddRedisModuleInstall();//redis
 builder.Services.AddSqlSugarInstall();
 builder.Services.AddSwaggerInstall();
 builder.Services.AddJwtInstall();
@@ -46,7 +47,7 @@ builder.Services.AddSaasDbInstall();//
 builder.Services.AddMultiLanguageInstall();//�����Է���
 builder.Services.AddDjyModuleInstall();//Djy����
 builder.Services.AddRuleEngineModuleInstall();//Djy�������������
-builder.Services.AddRedisModuleInstall();//redis
+
 // builder.Services.AddEndpointsApiExplorer();
 // builder.Services.AddSwaggerGen();