Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NewsController.cs

@@ -93,7 +93,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
             newsIBLL.SaveEntity(keyValue, entity);
 
             #region 发送到网站
-            if (entity.IsSend == "1")
+            if (entity.F_IsSendCMS == 1)
             {
                 //获取配置文件
                 string siteId = ConfigurationManager.AppSettings["SiteId"];
@@ -133,7 +133,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                     listCon.Add(con);
                     AList.contents = listCon;
                     //AList.reasons = "终审通过";
-                    Util.HttpMethods.HttpPosts("http://"+Ports+"/api/v1/contents/check", AList.ToJson(), ApiId);
+                    Util.HttpMethods.HttpPosts("http://" + Ports + "/api/v1/contents/check", AList.ToJson(), ApiId);
                     //Util.HttpMethods.HttpPosts("http://"+Ports+"/api/v1/contents/actions/check", AList.ToJson(), ApiId);
                 }
                 #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.cshtml

@@ -9,8 +9,8 @@
         <input id="F_FullHead" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请输入标题" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">是否下发到CMS</div>
-        <div id="IsSend" ></div>
+        <div class="lr-form-item-title">是否下发CMS</div>
+        <div id="F_IsSendCMS" ></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">新闻栏目<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.js

@@ -17,11 +17,11 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#IsSend').lrselect({
+            $('#F_IsSendCMS').lrselect({
                 data: [{ text: "是", value: "1" }, { text: "否", value: "0" }],
                 text: "text",
                 value: "value"
-            })
+            });
             //新闻栏目
             $('#F_CategoryId').lrDataItemSelect({ code: 'NewsCategory', maxHeight: 230 });
             //内容编辑器

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Index.js

@@ -82,7 +82,7 @@ var bootstrap = function ($, learun) {
                     { label: '标题', name: 'F_FullHead', width: 500, align: 'left' },
                     { label: '作者', name: 'F_AuthorName', width: 100, align: 'left' },
                     { label: '小编', name: 'F_CompileName', width: 100, align: 'left' },
-                    { label: '栏目', name: 'F_Category', width: 100, align: 'left' },
+                    { label: '栏目', name: 'F_CategoryId', width: 100, align: 'left' },
                     {
                         label: "发布时间", name: "F_ReleaseTime", width: 140, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Language/LGMap/LGMapService.cs

@@ -67,7 +67,7 @@ namespace Learun.Application.Language
         {
             try
             {
-                var sql = "select * from LR_Lg_Map where  F_TypeCode='" + TypeCode + "' AND  t.F_Code <>'' AND t.F_Code<>'undefined'";
+                var sql = "select * from LR_Lg_Map t where  F_TypeCode='" + TypeCode + "' AND  t.F_Code <>'' AND t.F_Code<>'undefined'";
                 return this.BaseRepository().FindList<LGMapEntity>(sql);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs

@@ -196,6 +196,11 @@ namespace Learun.Application.OA
         [Column("F_STATUS")]
         public string F_Status { get; set; }
 
+        /// <summary>
+        /// 是否下发到CMS
+        /// </summary>
+        [Column("F_ISSENDCMS")]
+        public int? F_IsSendCMS { get; set; }
 
         /// <summary>
         /// 阅读Id