|
@@ -53,15 +53,15 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
|
|
|
PageHelper.startPage(page.getPageNum(), page.getPageSize());
|
|
|
list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).orderByDesc("id"));
|
|
|
Integer count = vnoticeUserMapper.selectCount(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("is_read", 0));
|
|
|
- boolean isReadPoint = false;
|
|
|
+ boolean isRedPoint = false;
|
|
|
if (count > 0) {
|
|
|
- isReadPoint = true;
|
|
|
+ isRedPoint = true;
|
|
|
}
|
|
|
PageInfo<VnoticeUser> pageInfo = new PageInfo<VnoticeUser>(list);
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
map.put("list",pageInfo);
|
|
|
- map.put("list",pageInfo);
|
|
|
- msg.data = pageInfo;
|
|
|
+ map.put("isRedPoint",isRedPoint);
|
|
|
+ msg.data = map;
|
|
|
} else {
|
|
|
msg.setError("用户不存在或者未登录");
|
|
|
}
|