diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs
index eeca1f1b5..d86b5e4b1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs	
@@ -51,6 +51,11 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         public ActionResult GetList(string keyword)
         {
             var data = companyIBLL.GetList(keyword);
+            foreach (var item in data)
+            {
+                item.F_BriefIntroduction = WebHelper.HtmlDecode(item.F_BriefIntroduction);
+                item.F_EnrollmentInformation = WebHelper.HtmlDecode(item.F_EnrollmentInformation);
+            }
             return JsonResult(data);
         }
         /// <summary>
@@ -105,6 +110,8 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         {
             entity.SyncFlag = false;
             var list = companyIBLL.GetList();
+            entity.F_BriefIntroduction = WebHelper.HtmlEncode(entity.F_BriefIntroduction);
+            entity.F_EnrollmentInformation = WebHelper.HtmlEncode(entity.F_EnrollmentInformation);
             if (!string.IsNullOrEmpty(keyValue))
             {
                 entity.SyncFlag = true;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml
index 1c4675d7b..c9715b76f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml	
@@ -2,78 +2,85 @@
     ViewBag.Title = "学校添加";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-    <div class="lr-form-wrap" id="form">
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">学校名称<font face="宋体">*</font></div>
-            <input id="F_FullName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校编码<font face="宋体">*</font></div>
-            <input id="F_EnCode" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校简称<font face="宋体">*</font></div>
-            <input id="F_ShortName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">上级学校</div>
-            <div id="F_ParentId"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">成立时间</div>
-            <input id="F_FoundedTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">负责人</div>
-            <input id="F_Manager" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">电话</div>
-            <input id="F_OuterPhone" type="text" class="form-control" />
-        </div>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">学校名称<font face="宋体">*</font></div>
+        <input id="F_FullName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校编码<font face="宋体">*</font></div>
+        <input id="F_EnCode" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校简称<font face="宋体">*</font></div>
+        <input id="F_ShortName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">上级学校</div>
+        <div id="F_ParentId"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">成立时间</div>
+        <input id="F_FoundedTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">负责人</div>
+        <input id="F_Manager" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">电话</div>
+        <input id="F_OuterPhone" type="text" class="form-control" />
+    </div>
 
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">电子邮箱</div>
-            <input id="F_Email" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">照片</div>
-            <div id="F_Photo"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">校区简介</div>
-            <div id="F_BriefIntroduction" style="height:200px;"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">招生简介</div>
-            <div id="F_EnrollmentInformation" style="height:200px;"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">传真</div>
-            <input id="F_Fax" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">学校地点</div>
-            <div id="area" class="col-xs-6 lr-form-area">
-                <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
-                <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
-                <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
-            </div>
-            <div class="col-xs-6">
-                <input id="F_Address" type="text" placeholder="请输入详细地址" class="form-control" />
-            </div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">邮编</div>
-            <input id="F_Postalcode" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校官网</div>
-            <input id="F_WebAddress" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">电子邮箱</div>
+        <input id="F_Email" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">照片</div>
+        <div id="F_Photo"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">校区简介</div>
+        @*<div id="F_BriefIntroduction" style="height:200px;"></div>*@
+        <script id="F_BriefIntroduction" type="text/plain" style="height:270px;">
+        </script>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">招生简介</div>
+        @*<div id="F_EnrollmentInformation" style="height:200px;"></div>*@
+        <script id="F_EnrollmentInformation" type="text/plain" style="height:270px;">
+        </script>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">传真</div>
+        <input id="F_Fax" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">学校地点</div>
+        <div id="area" class="col-xs-6 lr-form-area">
+            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
+            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
+            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
         </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">备注</div>
-            <textarea id="F_Description" type="text" class="form-control" style="height:80px;"></textarea>
+        <div class="col-xs-6">
+            <input id="F_Address" type="text" placeholder="请输入详细地址" class="form-control" />
         </div>
     </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">邮编</div>
+        <input id="F_Postalcode" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校官网</div>
+        <input id="F_WebAddress" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="F_Description" type="text" class="form-control" style="height:80px;"></textarea>
+    </div>
+</div>
+<script src="~/Content/ueditor/ueditor.config.js"></script>
+<script src="~/Content/ueditor/ueditor.all.js"></script>
+<script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>
 @Html.AppendJsFile("/Areas/LR_OrganizationModule/Views/Company/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js
index 7314020ad..dfeacc4d3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js	
@@ -10,6 +10,8 @@ var acceptClick;
 var keyValue = '';
 var bootstrap = function ($, learun) {
     "use strict";
+    var F_BriefIntroductionUE;
+    var F_EnrollmentInformationUE;
     var selectedRow = learun.frameTab.currentIframe().selectedRow;
     var page = {
         init: function () {
@@ -24,15 +26,25 @@ var bootstrap = function ($, learun) {
             // 省市区
             $('#area').lrAreaSelect();
             $('#F_Photo').lrUploader();
-            var F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
-            $('#F_BriefIntroduction')[0].ue = F_BriefIntroductionUE;
-            var F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
-            $('#F_EnrollmentInformation')[0].ue = F_EnrollmentInformationUE;
+            F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
+            F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
         },
         initData: function () {
             if (!!selectedRow) {
                 keyValue = selectedRow.F_CompanyId;
                 $('#form').lrSetFormData(selectedRow);
+                if (selectedRow.F_BriefIntroduction) {
+                    setTimeout(function () {
+                        F_BriefIntroductionUE.setContent(selectedRow.F_BriefIntroduction);
+                    }, 100);
+
+                };
+                if (selectedRow.F_EnrollmentInformation) {
+                    setTimeout(function () {
+                        F_EnrollmentInformationUE.setContent(selectedRow.F_EnrollmentInformation);
+                    }, 100);
+
+                };
             }
         }
     };
@@ -45,7 +57,12 @@ var bootstrap = function ($, learun) {
         if (postData["F_ParentId"] == '' || postData["F_ParentId"] == '&nbsp;') {
             postData["F_ParentId"] = '0';
         }
-        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        postData["F_BriefIntroduction"] = F_BriefIntroductionUE.getContent(null, null, true);
+        postData["F_EnrollmentInformation"] = F_EnrollmentInformationUE.getContent(null, null, true);
+        var postDatas = {
+            strEntity: JSON.stringify(postData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Index.js
index 491a608b2..08293666a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Index.js	
@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
                     title: '添加学校',
                     url: top.$.rootUrl + '/LR_OrganizationModule/Company/Form',
                     width: 750,
-                    height: 500,
+                    height: 800,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -44,7 +44,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑学校',
                         url: top.$.rootUrl + '/LR_OrganizationModule/Company/Form',
                         width: 750,
-                        height: 500,
+                        height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }