通知公告调整编辑 查看

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js

@@ -68,14 +68,15 @@ var bootstrap = function ($, learun) {
                         height: 650,
                         maxmin: true,
                         callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
+                            //return top[id].acceptClick(refreshGirdData);
+                            return top[id].save(refreshGirdData);
                         }
                     });
                 }
             });
             // 查看
             $('#lr_view').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('SFileId');
+                var keyValue = $('#gridtable').jfGridValue('F_NewsId');
                 if (learun.checkrow(keyValue)) {
                     if (keyValue.indexOf(",") != -1) {
                         learun.alert.warning("只能选择一条记录查看！");
@@ -85,8 +86,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '查看',
                         url: top.$.rootUrl + '/LR_OAModule/Notice/FormFlow?keyValue=' + keyValue,
-                        width: 800,
-                        height: 700,
+                        width: 1000,
+                        height: 650,
                         btn: null
                     });
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs

@@ -4,6 +4,7 @@ using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.LR_Desktop
@@ -183,8 +184,12 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 }
                 else
                 {
-                    entity.Create();
-                    this.BaseRepository().Insert(entity);
+                    if (this.BaseRepository().FindList<MessageRemindEntity>(x =>
+                            x.ReceiptId == entity.ReceiptId && x.InstanceId == entity.InstanceId).Count() <= 0)
+                    {
+                        entity.Create();
+                        this.BaseRepository().Insert(entity);
+                    }
                 }
             }
             catch (Exception ex)