From 1c4fc74b0963c154a5d5b827389dc9169392331b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 03 Mar 2021 15:48:36 +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 |    6 ++++--
 1 files changed, 4 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..1e92608 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
@@ -1154,9 +1154,11 @@
     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