From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index c58fe37..19fdafd 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -1151,12 +1151,15 @@
}
@Override
+ @Transactional
public Result memberMessageReminder() {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- MemberSettingEntity selectById = memberSettingDao.selectById(memberId);
MemberMessageReminderVo memberMessageReminderVo = new MemberMessageReminderVo();
- memberMessageReminderVo.setMessageReminder(selectById.getMessageReminder());
+ MemberSettingEntity selectById = memberSettingDao.selectMemberSettingByMemberId(memberId);
+ if(ObjectUtil.isNotEmpty(selectById)) {
+ memberMessageReminderVo.setMessageReminder(selectById.getMessageReminder());
+ }
return Result.ok(memberMessageReminderVo);
}
--
Gitblit v1.9.1