新闻通知公告:自查,自改,自删

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',

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<NewsEntity>(strSql.ToString(), new { keyword = "%" + keyword + "%" }, pagination);
             }
             catch (Exception ex)
@@ -197,7 +202,7 @@ namespace Learun.Application.OA
             }
 
         }
-        
+
         #endregion
         #region 扩展数据