|
@@ -421,7 +421,7 @@ public class LoginController extends BaseController{
|
|
|
model.addAttribute("count", page.getList().size());//未读通知条数
|
|
|
model.addAttribute("count1", page.getCount());//未读通知条数
|
|
|
model.addAttribute("type", type);//返回公告类型
|
|
|
- //request.getSession().setAttribute("page",page);
|
|
|
+ // request.getSession().setAttribute("page",page);
|
|
|
oaNotify.setPage(new Page());
|
|
|
List<OaNotify> list = oaNotifyService.findAll(oaNotify);
|
|
|
List<Map<String,Object>> mapList = Lists.newArrayList();
|
|
@@ -438,6 +438,7 @@ public class LoginController extends BaseController{
|
|
|
//List转json格式
|
|
|
JSONArray json = JSONArray.fromObject(mapList);
|
|
|
model.addAttribute("oaNotifyList", json);
|
|
|
+
|
|
|
//待办事项
|
|
|
WorkProjectNotify workProjectNotify = new WorkProjectNotify();
|
|
|
workProjectNotify.setUser(user);
|