Merge remote-tracking branch 'origin/dev_group0329' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -397,6 +397,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                     //存入缓存
                     ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO();
                     ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(groupId, user.getUserId());
+                    if (null != memberMySql) {
                         memberRedisDTO.setMemberStatus(memberMySql.getStatus());
                         memberRedisDTO.setUserId(user.getUserId());
                         memberRedisDTO.setUserShowName(user.getShowName());
@@ -407,6 +408,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                         memberRedisDTO.setGroupId(groupId);
                         resiGroupMemberRedis.set(memberRedisDTO);
                     }
+                }
             } else {
 
                 logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1144,6 +1144,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 //存入缓存
                 ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO();
                 ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(groupId, user.getUserId());
+                if(null != memberMySql){
                     memberRedisDTO.setMemberStatus(memberMySql.getStatus());
                     memberRedisDTO.setUserId(user.getUserId());
                     memberRedisDTO.setUserShowName(user.getShowName());
@@ -1154,6 +1155,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     memberRedisDTO.setGroupId(groupId);
                     resiGroupMemberRedis.set(memberRedisDTO);
                 }
+            }
         } else {
 
             logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND);