From d0ae7aaed97300f4cbefb9542f041f0c72d5edf3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 11:27:39 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange 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