springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,6 +24,7 @@ <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -405,7 +406,7 @@ <workItem from="1610956684718" duration="7037000" /> <workItem from="1611019208339" duration="94460000" /> <workItem from="1611365644515" duration="33195000" /> <workItem from="1611536010905" duration="6279000" /> <workItem from="1611536010905" duration="7459000" /> </task> <servers /> </component> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -79,6 +79,9 @@ @Override public R detailMicroWish(Long id, Long userId) { ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id); if (ObjectUtils.isEmpty(comActMicroWishVO)) { return R.fail("微心愿不存在"); } Integer starNum = comActMicroWishVO.getStarNum(); if (null==starNum) { comActMicroWishVO.setStarNum(0); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1163,10 +1163,15 @@ List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>(); List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt)); if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) { List<Integer> typeList=new ArrayList<>(4); sysUserNoticeDOS.forEach(sysUserNoticeDO -> { SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO(); BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO); sysUserNoticeVOList.add(sysUserNoticeVO); Integer type = sysUserNoticeDO.getType(); if (!typeList.contains(type)) { SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO(); BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO); sysUserNoticeVOList.add(sysUserNoticeVO); typeList.add(type); } }); } noticeUnReadVO.setSysUserNoticeVOList(sysUserNoticeVOList);
