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({