diff --git a/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java b/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java index 2395b5c..cf3564c 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java +++ b/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java @@ -120,6 +120,8 @@ public class SysUser extends BaseEntity */ private Double wallet; + private Boolean isAttention; + public SysUser() { @@ -405,4 +407,12 @@ public class SysUser extends BaseEntity ", freePoints=" + freePoints + '}'; } + + public Boolean getAttention() { + return isAttention; + } + + public void setAttention(Boolean attention) { + isAttention = attention; + } } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java index c2c6816..dac4506 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java @@ -36,9 +36,6 @@ public class SysUserAttentionServiceImpl extends ServiceImpl selectAttentionPage(PageVo pageVo) { PageHelper pageHelper = new PageHelper(); - pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize()); + pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize()); - if (pageVo.getType() == null){ + Long userIdMax = SecurityUtils.getUserIdMax(); + if (pageVo.getType() == null) { - pageVo.setType(SecurityUtils.getUserIdMax()); + pageVo.setType(userIdMax); } //条件构造器 List sysUserList = sysUserMapper.selectUserPage(pageVo.getType()); + for (SysUser sysUser : sysUserList) { + + if (userIdMax == 0L) { + sysUser.setAttention(false); + } else { + sysUser.setAttention(selectAttention(sysUser.getUserId())); + } + + } return new PageInfo(sysUserList); } @@ -156,17 +163,28 @@ public class SysUserAttentionServiceImpl extends ServiceImpl selectToAttentionPage(PageVo pageVo) { PageHelper pageHelper = new PageHelper(); - pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize()); + pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize()); - if (pageVo.getType() == null){ + Long userIdMax = SecurityUtils.getUserIdMax(); + if (pageVo.getType() == null) { - pageVo.setType(SecurityUtils.getUserIdMax()); + pageVo.setType(userIdMax); } //条件构造器 List sysUserList = sysUserMapper.selectToUserPage(pageVo.getType()); + for (SysUser sysUser : sysUserList) { + + if (userIdMax == 0L) { + sysUser.setAttention(false); + } else { + sysUser.setAttention(selectAttention(sysUser.getUserId())); + } + + } + return new PageInfo(sysUserList); }