From 69bd80bb16bf8bcae8cb082d418ecc91e8484575 Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Wed, 11 Jan 2023 15:28:39 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E6=9C=83=E5=93=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20[WHY]=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

寄送訊息調整(EmailBody)
---
 .../ShowEasy/MemberMaintain_QryService.cs      | 18 +++++++++++-------
 .../ShowEasy/MemberMaintain_UpdService.cs      |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_QryService.cs
index 2cfee60..364f513 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_QryService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_QryService.cs
@@ -42,23 +42,27 @@ namespace EasyBL.WEBAPP.SYS
                     var sPhone = _fetchString(i_crm, @"Phone");
                     var bExcel = _fetchBool(i_crm, @"Excel");
 
-                    pml.DataList = db.Queryable<SETB_CMS_Member, SETB_SYS_Country, OTB_SYS_Arguments>((t1, t2, t3) => new object[]{
+                    pml.DataList = db.Queryable<SETB_CMS_Member, SETB_SYS_Country, OTB_SYS_Arguments>((t1, t2, t3) => new object[] { 
                         JoinType.Left, t1.OrgID == t2.OrgID && t1.CountryID == t2.CountryID,
-                        JoinType.Left,t1.OrgID == t3.OrgID && t1.ArgumentID == t3.ArgumentID
+                        JoinType.Left, t1.OrgID == t3.OrgID && t1.ArgumentID == t3.ArgumentID
                     })
-                        .Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.MemberID.Contains(sMemberID) && t1.FirstName.Contains(sFirstName) && t1.LastName.Contains(sLastName) && t1.Phone.Contains(sPhone))
-                        .WhereIF(!string.IsNullOrEmpty(sCountryID), (t1, t2, t3) => t1.CountryID == sCountryID)
-                        .WhereIF(!string.IsNullOrEmpty(sArgumentID), (t1, t2, t3) => t1.ArgumentID == sArgumentID)
+                        .Where((t1, t2, t3) => t1.OrgID == i_crm.ORIGID && t1.MemberID.Contains(sMemberID))
+                        .WhereIF(!string.IsNullOrEmpty(sCountryID), (t1, t2, t3) => t1.CountryID == t2.CountryID)
+                        .WhereIF(!string.IsNullOrEmpty(sArgumentID), (t1, t2, t3) => t1.ArgumentID == t3.ArgumentID)
+
+
                         .Select((t1, t2, t3) => new View_CMS_Member
                         {
                             MemberID = SqlFunc.GetSelfAndAutoFill(t1.MemberID),
                             CountryName = t2.CountryName,
                             Country_ENCode = t2.Country_ENCode,
-                            ArgumentValue = t3.ArgumentValue,
+                            ArgumentValue = t3.ArgumentValue
+
+                            
                         })
                         .OrderBy(sSortField, sSortOrder)
                         .ToPageList(pml.PageIndex, bExcel ? 100000 : pml.PageSize, ref iPageCount);
-                  
+
                     pml.Total = iPageCount;
 
                     rm = new SuccessResponseMessage(null, i_crm);
diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_UpdService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_UpdService.cs
index d59ccef..d4719dd 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_UpdService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/MemberMaintain_UpdService.cs
@@ -154,8 +154,8 @@ namespace EasyBL.WEBAPP.WSM
                         };
                         toEmail.Add(oEmailTo);
                         oEmail.FromUserName = "系統自動發送";//取fonfig
-                        oEmail.Title = "奕達運通管理系統錯誤信息派送";//取fonfig
-                        oEmail.EmailBody = "新密碼為：123456";
+                        oEmail.Title = "ShowEasy 密碼已重設";//取fonfig
+                        oEmail.EmailBody = "感謝您與ShowEasy客服聯繫，您的新密碼為：123456";
                         oEmail.IsCCSelf = false;
                         oEmail.Attachments = null;
                         oEmail.EmailTo = toEmail;