From 108cd681ccc3c65fe1da4a09c349dba3b5bec996 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 25 Oct 2022 18:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E9=80=9A=E7=9F=A5=E5=85=AC?= =?UTF-8?q?=E5=91=8A:=E8=87=AA=E6=9F=A5,=E8=87=AA=E6=94=B9,=E8=87=AA?= =?UTF-8?q?=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_OAModule/Views/Notice/IndexFlow.js | 9 +++++++-- .../Learun.Application.OA/Notice/NoticeService.cs | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) 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 9bc0618e2..69f7aa52c 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 @@ -57,8 +57,13 @@ var bootstrap = function ($, learun) { } var SendFlag = $('#gridtable').jfGridValue('F_Status'); if (SendFlag == "1" || SendFlag == "2") { - learun.alert.warning("当前项目已提交不能编辑!"); - return; + var IsSend = $('#gridtable').jfGridValue('IsSend'); + console.log(IsSend, "IsSend") + if (IsSend != "0") { + learun.alert.warning("当前项目已提交不能编辑!"); + return; + } + } learun.layerForm({ id: 'formedit', diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs index 5ecfdcd2b..daad655f7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs @@ -26,12 +26,17 @@ namespace Learun.Application.OA { try { + var user = LoginUserInfo.Get(); var strSql = new StringBuilder(); strSql.Append("SELECT * FROM LR_OA_News t WHERE t.F_TypeId = 2 and F_Status<>'-1' and F_DeleteMark=0"); if (!string.IsNullOrEmpty(keyword)) { strSql.Append(" AND F_FullHead like @keyword"); } + if (user.Description != "超级管理员") + { + strSql.Append(" AND F_CreateUserName ='" + user.realName + "'"); + } return this.BaseRepository().FindList(strSql.ToString(), new { keyword = "%" + keyword + "%" }, pagination); } catch (Exception ex) @@ -197,7 +202,7 @@ namespace Learun.Application.OA } } - + #endregion #region 扩展数据