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((t1, t2, t3) => new object[]{ + pml.DataList = db.Queryable((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;