From 6077a97023faf562a00214915049df2e8a6c5295 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 20 Dec 2021 14:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/NoticeController.cs | 30 +++++++++++++++++++
.../Views/Home/AdminDesktop/Index.js | 16 +++++-----
2 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
index a08299eed..692204a20 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
@@ -37,6 +37,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
private DataItemIBLL dataItemIbll = new DataItemBLL();
private DepartmentIBLL departmentIbll = new DepartmentBLL();
private Sys_InformationPushIBLL sys_InformationPushIBLL = new Sys_InformationPushBLL();
+ private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
private DepartmentReleasePermissionsIBLL departmentReleasePermissionsIbll =
new DepartmentReleasePermissionsBLL();
@@ -414,6 +415,9 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
}
}
PushWeixin(needpostuserlist, entity.F_FullHead);
+
+ //消息提醒表
+ PushMessageRemind(needpostuserlist, entity);
return Task.CompletedTask;
}
catch (Exception e)
@@ -490,6 +494,32 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
}
}
}
+
+ ///
+ /// 消息提醒
+ ///
+ ///
+ ///
+ public void PushMessageRemind(List needpostuserlist, NewsEntity model)
+ {
+ foreach (UserEntity userinfo in needpostuserlist)
+ {
+ MessageRemindEntity entity = new MessageRemindEntity();
+ entity.ReceiptId = userinfo.F_UserId;
+ entity.ReceiptName = userinfo.F_RealName;
+ entity.SenderId = model.F_CreateUserId;
+ entity.SenderName = model.F_CreateUserName;
+ entity.TheTitle = "通知公告";
+ entity.TheContent = model.F_FullHead;
+ entity.InstanceId = model.F_NewsId;
+ entity.ConnectionUrl = "/Utility/ListContentIndex?id=";
+ entity.SendTime = DateTime.Now;
+ entity.ReadSigns = false;
+ messageRindIBLL.SaveEntity("", entity);
+ }
+
+ }
+
#endregion
#region 流程
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js
index c9f28772b..63f10fd29 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js
@@ -289,18 +289,16 @@
$(".lr-desktop-panel").lrscroll();
top.learun.clientdata.getAsync("desktop",
{
- callback: function (g) {
- c(g.data.list || []);
- e(g.data.target || []);
- a(g.data.chart || []);
+ callback: function(g) {
+ e(g.target || []);
+ c(g.list || []);
+ a(g.chart || []);
}
-
});
funopen();
- }
- //window.setInterval(funopen, 60000);
-
- //window.clearInterval(t1);
+ }
+ window.setInterval(funopen, 60000);
+
//消息提醒
function funopen() {
$.ajax({