Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
commit
6d0bb3f46d
|
|
@ -335,13 +335,17 @@ namespace FineUIPro.Web.ZHGL.Information
|
|||
GetItems(report.MillionsMonthlyReportId);
|
||||
foreach (var item in items)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(item.Name))
|
||||
{
|
||||
item.Affiliation = System.Web.HttpUtility.HtmlDecode(item.Affiliation);
|
||||
item.Name = System.Web.HttpUtility.HtmlDecode(item.Name);
|
||||
MillionsMonthlyReportItemService.AddMillionsMonthlyReportItem(item);
|
||||
mReportItemList.Add(item);
|
||||
}
|
||||
item.Affiliation = System.Web.HttpUtility.HtmlDecode(item.Affiliation);
|
||||
item.Name = !string.IsNullOrWhiteSpace(item.Name) ? System.Web.HttpUtility.HtmlDecode(item.Name) : string.Empty;
|
||||
MillionsMonthlyReportItemService.AddMillionsMonthlyReportItem(item);
|
||||
mReportItemList.Add(item);
|
||||
//if (!string.IsNullOrEmpty(item.Name))
|
||||
//{
|
||||
// item.Affiliation = System.Web.HttpUtility.HtmlDecode(item.Affiliation);
|
||||
// item.Name = System.Web.HttpUtility.HtmlDecode(item.Name);
|
||||
// MillionsMonthlyReportItemService.AddMillionsMonthlyReportItem(item);
|
||||
// mReportItemList.Add(item);
|
||||
//}
|
||||
}
|
||||
if (type == "updata") //数据同步
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue