Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs

@@ -139,6 +139,10 @@ namespace Learun.Application.WebApi.Modules
                 F_SendPostId.Trim(',');
                 shlist.F_SendPostId = F_SendPostId;
             }
+            if (!shlist.F_NewsContent.IsEmpty())
+            {
+                shlist.F_NewsContent = WebHelper.HtmlDecode(shlist.F_NewsContent);
+            }
             return Success(shlist);
         }
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs

@@ -70,6 +70,10 @@ namespace Learun.Application.WebApi
         {
             string keyValue = this.GetReqData();
             var SYS_ReceiveMessageData = sYS_ReceiveMessageIBLL.GetUrlSYS_ReceiveMessageEntity(keyValue);
+            if (SYS_ReceiveMessageData != null)
+            {
+                SYS_ReceiveMessageData.CONTENTS = WebHelper.HtmlDecode(SYS_ReceiveMessageData.CONTENTS);
+            }
             var jsonData = new
             {
                 SYS_ReceiveMessage = SYS_ReceiveMessageData,

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs

@@ -77,7 +77,7 @@ namespace Learun.Application.WebApi
                     result = "/" + result.Substring(result.IndexOf("Resource"));
                 }
                 Sys_ReceiveFileData.Url = result;
-
+                Sys_ReceiveFileData.Contents = WebHelper.HtmlDecode(Sys_ReceiveFileData.Contents);
             }
             var jsonData = new
             {