|
@ -1590,7 +1590,8 @@ namespace EasyBL.WEBAPP.ShowEasy |
|
|
CurrencyName=t3.ArgumentValue, |
|
|
CurrencyName=t3.ArgumentValue, |
|
|
ExpenseDescription ="", |
|
|
ExpenseDescription ="", |
|
|
SupplierName=t4.CompanyName, |
|
|
SupplierName=t4.CompanyName, |
|
|
SupplierLogo=t4.LogoFile |
|
|
|
|
|
|
|
|
SupplierLogo=t4.LogoFile, |
|
|
|
|
|
PreviewFile=t1.PreviewFile |
|
|
|
|
|
|
|
|
}).Single(); |
|
|
}).Single(); |
|
|
//常見問題
|
|
|
//常見問題
|
|
@ -1703,10 +1704,10 @@ namespace EasyBL.WEBAPP.ShowEasy |
|
|
} |
|
|
} |
|
|
objONSiteBaseInfo.ReceivinPlaces = sReceivinPlaces; |
|
|
objONSiteBaseInfo.ReceivinPlaces = sReceivinPlaces; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
string requestUrl = Common.ConfigGetValue("", "ida:RedirectUri"); |
|
|
if (!string.IsNullOrEmpty(objONSiteBaseInfo.SupplierLogo)) { |
|
|
if (!string.IsNullOrEmpty(objONSiteBaseInfo.SupplierLogo)) { |
|
|
|
|
|
|
|
|
string requestUrl = Common.ConfigGetValue("", "ida:RedirectUri"); |
|
|
|
|
|
|
|
|
|
|
|
var oFilePath = db.Queryable<OTB_SYS_Files>() |
|
|
var oFilePath = db.Queryable<OTB_SYS_Files>() |
|
|
.Where(x => x.ParentID == objONSiteBaseInfo.SupplierLogo && x.OrgID == sORIGID) |
|
|
.Where(x => x.ParentID == objONSiteBaseInfo.SupplierLogo && x.OrgID == sORIGID) |
|
|
.Select(x => new FileDTO |
|
|
.Select(x => new FileDTO |
|
@ -1725,9 +1726,25 @@ namespace EasyBL.WEBAPP.ShowEasy |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
if (!string.IsNullOrEmpty(objONSiteBaseInfo.PreviewFile)) |
|
|
|
|
|
{ |
|
|
|
|
|
var oFilePath = db.Queryable<OTB_SYS_Files>() |
|
|
|
|
|
.Where(x => x.ParentID == objONSiteBaseInfo.PreviewFile && x.OrgID == sORIGID) |
|
|
|
|
|
.Select(x => new FileDTO |
|
|
|
|
|
{ |
|
|
|
|
|
FileID = x.FileID, |
|
|
|
|
|
FileName = x.FileName, |
|
|
|
|
|
FilePath = x.FilePath |
|
|
|
|
|
}) |
|
|
|
|
|
.Single(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (oFilePath != null) |
|
|
|
|
|
{ |
|
|
|
|
|
objONSiteBaseInfo.PreviewFile = requestUrl + "/" + oFilePath.FilePath.Replace("\\", "/"); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
return objONSiteBaseInfo; |
|
|
return objONSiteBaseInfo; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|