From ac0720f3f45771718de7db9f492d7bcc6aa1cffd Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 20 Sep 2025 18:28:28 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=B0=83?= =?UTF-8?q?=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java | 2 +- .../com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java index e5d6e4330..9fe4c89a9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java @@ -96,7 +96,7 @@ public class UserFavoritesServiceImpl implements IUserFavoritesService { // 新增用户收藏商品消息通知 this.noticeService.createSingleNotice(SecurityUtils.getUserId(), "收藏商品成功!", NoticeType.NOTICE.getValue(), NoticeOwnerType.SYSTEM.getValue(), userFav.getStoreId(), UserNoticeType.FAVORITE_PRODUCT.getValue(), - "恭喜您，收藏" + (ObjectUtils.isNotEmpty(store) ? store.getStoreName() : "") + " 家商品: " + + "恭喜您，收藏 " + (ObjectUtils.isNotEmpty(store) ? store.getStoreName() : "") + " 家商品: " + (ObjectUtils.isNotEmpty(storeProd) ? storeProd.getProdArtNum() : "") + "成功!"); }); return count; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java index 88f83f83b..0cad2a092 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeServiceImpl.java @@ -46,8 +46,12 @@ public class UserNoticeServiceImpl implements IUserNoticeService { @Override @Transactional(readOnly = true) public Page pcPage(UserNoticePageDTO pageDTO) { + final Long userId = SecurityUtils.getUserIdSafe(); + if (ObjectUtils.isEmpty(userId)) { + throw new ServiceException("用户未登录，请先登录!", HttpStatus.ERROR); + } PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); - List list = this.userNoticeMapper.selectUserNoticeList(SecurityUtils.getUserId(), pageDTO.getNoticeTitle(), pageDTO.getNoticeType()); + List list = this.userNoticeMapper.selectUserNoticeList(userId, pageDTO.getNoticeTitle(), pageDTO.getNoticeType()); list.forEach(x -> x.setTargetNoticeTypeName(UserNoticeType.of(x.getTargetNoticeType()).getLabel())); return Page.convert(new PageInfo<>(list)); }