From 0441b84afa14fc427405250f8632249f3379fd8d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 6 Apr 2021 13:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ResiTopicCommentServiceImpl.java     | 20 ++++++++++---------
 .../service/impl/ResiTopicServiceImpl.java    | 20 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index ed76255ad1..f7c7f95d0e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -391,15 +391,17 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                     //存入缓存
                     ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO();
                     ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(groupId, user.getUserId());
-                    memberRedisDTO.setMemberStatus(memberMySql.getStatus());
-                    memberRedisDTO.setUserId(user.getUserId());
-                    memberRedisDTO.setUserShowName(user.getShowName());
-                    memberRedisDTO.setEnterGroupType(memberMySql.getEnterGroupType());
-                    memberRedisDTO.setGroupLeaderFlag(memberMySql.getGroupLeaderFlag());
-                    memberRedisDTO.setUserHeadPhoto(user.getHeadPhoto());
-                    memberRedisDTO.setMemberMobile(user.getRegMobile());
-                    memberRedisDTO.setGroupId(groupId);
-                    resiGroupMemberRedis.set(memberRedisDTO);
+                    if (null != memberMySql) {
+                        memberRedisDTO.setMemberStatus(memberMySql.getStatus());
+                        memberRedisDTO.setUserId(user.getUserId());
+                        memberRedisDTO.setUserShowName(user.getShowName());
+                        memberRedisDTO.setEnterGroupType(memberMySql.getEnterGroupType());
+                        memberRedisDTO.setGroupLeaderFlag(memberMySql.getGroupLeaderFlag());
+                        memberRedisDTO.setUserHeadPhoto(user.getHeadPhoto());
+                        memberRedisDTO.setMemberMobile(user.getRegMobile());
+                        memberRedisDTO.setGroupId(groupId);
+                        resiGroupMemberRedis.set(memberRedisDTO);
+                    }
                 }
             } else {
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index c5b81bde52..d077e9a7d3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1116,15 +1116,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 //存入缓存
                 ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO();
                 ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(groupId, user.getUserId());
-                memberRedisDTO.setMemberStatus(memberMySql.getStatus());
-                memberRedisDTO.setUserId(user.getUserId());
-                memberRedisDTO.setUserShowName(user.getShowName());
-                memberRedisDTO.setEnterGroupType(memberMySql.getEnterGroupType());
-                memberRedisDTO.setGroupLeaderFlag(memberMySql.getGroupLeaderFlag());
-                memberRedisDTO.setUserHeadPhoto(user.getHeadPhoto());
-                memberRedisDTO.setMemberMobile(user.getRegMobile());
-                memberRedisDTO.setGroupId(groupId);
-                resiGroupMemberRedis.set(memberRedisDTO);
+                if(null != memberMySql){
+                    memberRedisDTO.setMemberStatus(memberMySql.getStatus());
+                    memberRedisDTO.setUserId(user.getUserId());
+                    memberRedisDTO.setUserShowName(user.getShowName());
+                    memberRedisDTO.setEnterGroupType(memberMySql.getEnterGroupType());
+                    memberRedisDTO.setGroupLeaderFlag(memberMySql.getGroupLeaderFlag());
+                    memberRedisDTO.setUserHeadPhoto(user.getHeadPhoto());
+                    memberRedisDTO.setMemberMobile(user.getRegMobile());
+                    memberRedisDTO.setGroupId(groupId);
+                    resiGroupMemberRedis.set(memberRedisDTO);
+                }
             }
         } else {