修改任务接口

ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs

@@ -1292,7 +1292,10 @@ namespace DS.WMS.Core.TaskPlat.Method
                 if (bookingOrderEntity.OperatorId > 0)
                 {
                     var opId = bookingOrderEntity.OperatorId;
-                    var opUser = _userService.GetUserInfo(opId.ToString()).Data;
+
+                    var opUser = db.Queryable<SysUser>().Filter(null,true).First(x => x.Id == bookingOrderEntity.OperatorId && x.TenantId == long.Parse(user.TenantId));
+
+                    //var opUser = _userService.GetUserInfo(opId.ToString()).Data;
 
                     if (opUser != null && !string.IsNullOrWhiteSpace(opUser.Email))
                     {
@@ -1326,7 +1329,7 @@ namespace DS.WMS.Core.TaskPlat.Method
                 string emailTitle = $"Booking Confirmation : {taskBCInfo.MBL_NO}";
                 string filePath = string.Empty;
 
-                UserViewModel opUserInfo = _userService.GetUserInfo(bookingOrderEntity.OperatorId.ToString()).Data;
+                var opUserInfo = db.Queryable<SysUser>().Filter(null, true).First(x => x.Id == bookingOrderEntity.OperatorId && x.TenantId == long.Parse(user.TenantId));
 
                 if (taskBCInfo.BUSI_TYPE == "BookingAmendment")
                 {
@@ -1470,7 +1473,7 @@ namespace DS.WMS.Core.TaskPlat.Method
         /// <param name="opUserInfo">订舱OP详情</param>
         /// <param name="tenantName">当前租户全称</param>
         /// <returns>返回生成的HTML</returns>
-        public async Task<string> GenerateSendEmailHtml(TaskBCInfo taskBCInfo, UserViewModel opUserInfo, string tenantName)
+        public async Task<string> GenerateSendEmailHtml(TaskBCInfo taskBCInfo, SysUser opUserInfo, string tenantName)
         {
             string result = string.Empty;
 
@@ -1629,7 +1632,7 @@ namespace DS.WMS.Core.TaskPlat.Method
         /// <param name="opUserInfo">订舱OP详情</param>
         /// <param name="tenantName">当前租户全称</param>
         /// <returns>返回生成的HTML</returns>
-        public async Task<string> GenerateSendEmailHtmlAmendment(TaskBCInfo taskBCInfo, UserViewModel opUserInfo, string tenantName)
+        public async Task<string> GenerateSendEmailHtmlAmendment(TaskBCInfo taskBCInfo, SysUser opUserInfo, string tenantName)
         {
             string result = string.Empty;
 

ds-wms-service/DS.WMS.TaskApi/Program.cs

@@ -38,6 +38,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();
@@ -45,7 +46,7 @@ builder.Services.AddSaasDbInstall();//
 builder.Services.AddMultiLanguageInstall();//多语言服务
 builder.Services.AddDjyModuleInstall();//Djy服务
 builder.Services.AddRuleEngineModuleInstall();//Djy规则引擎校验服务
-builder.Services.AddRedisModuleInstall();//redis
+
 builder.Services.AddTaskPlatMapsterSetup(); // 全局的Mapster自定义映射规则
 // builder.Services.AddEndpointsApiExplorer();
 // builder.Services.AddSwaggerGen();