消息通知首页查询条件修改

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -108,11 +108,13 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     private QueryWrapper<NoticeEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
         String noticeTitle = ((String) params.get("noticeTitle"));
+        String noticeCategory = ((String) params.get("noticeCategory"));
         if (StringUtils.isNotBlank(noticeTitle)) {
             noticeTitle.trim();
         }
         QueryWrapper<NoticeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
+                .eq(StringUtils.isNotBlank(noticeCategory),"NOTICE_CATEGORY",noticeCategory)
                 .like(StringUtils.isNotBlank(noticeTitle), "NOTICE_TITLE", noticeTitle);
         return wrapper;
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -1023,7 +1023,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         EpdcAppUserRankingResultDTO rangking = new EpdcAppUserRankingResultDTO();
         // 获取排好序的   排行榜数据数据
         rangking.setRank(this.sortListUsersRank(formDto));
-        // 判断当前用户是否产生过积分记录
+        // 查询当前用户积分记录
         EpdcAppRankingUserDTO currentUserDTO = baseDao.selectCurrentUserRanking(formDto);
         // 返回当前登录用户积分排名
         currentUserDTO.setUserId(formDto.getUserId());