From ec1251e4d3b690cdf947a7fa76a35d6669ddc5f8 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 29 Mar 2024 08:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=8F=B0?= =?UTF-8?q?=E7=AB=99DRAFT=E9=82=AE=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TaskManagePlat/TaskManageBCService.cs | 12 ++++++++++-- .../Service/TaskManagePlat/TaskManageDRAFTService.cs | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs index 0e848afc..3379f1d1 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs @@ -1729,7 +1729,11 @@ namespace Myshipping.Application baseHtml = baseHtml.Replace("#opemail#", ""); } - if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Tel)) + if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Phone)) + { + baseHtml = baseHtml.Replace("#optel#", opUserInfo.Phone); + } + else if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Tel)) { baseHtml = baseHtml.Replace("#optel#", opUserInfo.Tel); } @@ -1878,7 +1882,11 @@ namespace Myshipping.Application baseHtml = baseHtml.Replace("#opemail#", ""); } - if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Tel)) + if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Phone)) + { + baseHtml = baseHtml.Replace("#optel#", opUserInfo.Phone); + } + else if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Tel)) { baseHtml = baseHtml.Replace("#optel#", opUserInfo.Tel); } diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageDRAFTService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageDRAFTService.cs index c13bcef6..ceb4d39f 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageDRAFTService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageDRAFTService.cs @@ -441,7 +441,11 @@ namespace Myshipping.Application baseHtml = baseHtml.Replace("#opemail#", ""); } - if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Tel)) + if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Phone)) + { + baseHtml = baseHtml.Replace("#optel#", opUserInfo.Phone); + } + else if (opUserInfo != null && !string.IsNullOrWhiteSpace(opUserInfo.Tel)) { baseHtml = baseHtml.Replace("#optel#", opUserInfo.Tel); }