From 566688e65e27730f872d7794b93a3c1a22c343c9 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 30 Mar 2022 15:40:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E8=A8=80=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=8F=E7=9B=AE=E6=9C=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E3=80=81=E6=98=AF=E5=90=A6=E4=B8=8B=E5=8F=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=9B=9E=E5=A1=AB=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_OAModule/Controllers/NewsController.cs | 4 ++-- .../Areas/LR_OAModule/Views/News/Form.cshtml | 4 ++-- .../Areas/LR_OAModule/Views/News/Form.js | 4 ++-- .../Areas/LR_OAModule/Views/News/Index.js | 2 +- .../Learun.Application.Language/LGMap/LGMapService.cs | 2 +- .../Learun.Application.OA/News/NewsEntity.cs | 5 +++++ 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NewsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NewsController.cs index f112cb0a3..3c8c0e95f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NewsController.cs +++ b/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 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.cshtml index acf4cb7e9..1f7b26fe7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.cshtml @@ -9,8 +9,8 @@
-
是否下发到CMS
-
+
是否下发CMS
+
新闻栏目*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.js index a6e7d2b64..2b38d0f69 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Form.js +++ b/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 }); //内容编辑器 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Index.js index e022b481a..254854fff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/News/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Language/LGMap/LGMapService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Language/LGMap/LGMapService.cs index 5cab4639c..c015a3b25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Language/LGMap/LGMapService.cs +++ b/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(sql); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs index d5264fa5a..787db7530 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs +++ b/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; } + /// + /// 是否下发到CMS + /// + [Column("F_ISSENDCMS")] + public int? F_IsSendCMS { get; set; } /// /// 阅读Id