diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
index 85721689d..ad7935c92 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs	
@@ -490,6 +490,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         public ActionResult GetFormDataByProcessId(string processId)
         {
             NewsEntity OANewsData = noticeIBLL.GetEntityByProcessId(processId);
+            OANewsData.F_NewsContent=WebHelper.HtmlDecode(OANewsData.F_NewsContent);
             var jsonData = new
             {
                 OANews = OANewsData,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml
index efbb7051f..bf8306d53 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml	
@@ -43,7 +43,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">公告内容</div>
-        <div id="editor" readonly="readonly" style="height:300px;"></div>
+        <div id="editor"  style="height:300px;"></div>
         @*<script id="editor" type="text/plain" style="height:270px;">
         </script>*@
     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js
index 8b193d7b5..b2d67294e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js	
@@ -66,6 +66,9 @@ var bootstrap = function ($, learun) {
                     }
                     else {
                         $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        setTimeout(function () {
+                            ue.setContent(data[id].F_NewsContent);
+                        }, 100);
                     }
                 }
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js
index 30630a9c9..f729446e2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
@@ -137,6 +137,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_OAModule/Notice/GetPageList',
                 headData: [
                     { label: '公告标题', name: 'F_FullHead', index: 'F_FullHead', width: 600, align: 'left' },
+                    { label: '发布人员', name: 'F_CreateUserName', index: 'F_CreateUserName', width: 100, align: 'left' },
                     { label: '公告类别', name: 'F_Category', index: 'F_Category', width: 100, align: 'center' },
                     {
                         label: "发布时间", name: "F_ReleaseTime", index: "F_ReleaseTime", width: 140, align: "center",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js
index 849a56450..8c3146061 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js	
@@ -45,6 +45,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_OAModule/Notice/GetListOfSelfJY',
                 headData: [
                     { label: '公告标题', name: 'F_FullHead', index: 'F_FullHead', width: 600, align: 'left' },
+                    { label: '发布人员', name: 'F_CreateUserName', index: 'F_CreateUserName', width: 100, align: 'left' },
                     { label: '公告类别', name: 'F_Category', index: 'F_Category', width: 100, align: 'center' },
                     {
                         label: "发布时间", name: "F_ReleaseTime", index: "F_ReleaseTime", width: 140, align: "center",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 489b3b61f..5d293d24b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -16,17 +16,17 @@
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
 
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--金隅-->
-  <!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
+  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <!--126西昌测试-->
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />