From 72034cb5ab97b7244fd52e82d9ec562da98d22a7 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 4 Jun 2020 16:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/NoticeServiceImpl.java | 2 ++ .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index c49bc38e..5277c210 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/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 private QueryWrapper getWrapper(Map 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 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; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index d7804ee9..431afccc 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/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 implem EpdcAppUserRankingResultDTO rangking = new EpdcAppUserRankingResultDTO(); // 获取排好序的 排行榜数据数据 rangking.setRank(this.sortListUsersRank(formDto)); - // 判断当前用户是否产生过积分记录 + // 查询当前用户积分记录 EpdcAppRankingUserDTO currentUserDTO = baseDao.selectCurrentUserRanking(formDto); // 返回当前登录用户积分排名 currentUserDTO.setUserId(formDto.getUserId());