Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCommentServiceImpl.java

@@ -16,6 +16,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.IssueCommentService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +31,7 @@ import java.util.List;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2023-02-02
  */
+@Slf4j
 @Service
 public class IssueCommentServiceImpl extends BaseServiceImpl<IssueCommentDao, IssueCommentEntity> implements IssueCommentService {
     @Autowired
@@ -61,6 +63,7 @@ public class IssueCommentServiceImpl extends BaseServiceImpl<IssueCommentDao, Is
         userIdList.add(dto.getUserId());
         Result<List<UserBaseInfoResultDTO>> userInfoRes= userOpenFeignClient.queryUserBaseInfo(userIdList);
         if(!userInfoRes.success()|| CollectionUtils.isEmpty(userInfoRes.getData())){
+            log.error("议题评论查询用户信息异常userId: "+dto.getUserId());
           throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"查询用户信息异常userId:"+dto.getUserId(),"查询用户信息异常");
         }
         IssueCommentEntity entity = ConvertUtils.sourceToTarget(dto, IssueCommentEntity.class);

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -131,6 +131,7 @@ public class UserBaseInfoRedis {
                         String gridFullName = gridInfoCache.getGridNamePath();
                         baseInfo.setRegisteredGridName(gridFullName);
                         StringBuffer buffer = new StringBuffer(baseInfo.getSurname());
+                        if(StringUtils.isNotBlank(baseInfo.getGender())){
                             switch (baseInfo.getGender()) {
                                 case NumConstant.ONE_STR:
                                     buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE);
@@ -141,6 +142,9 @@ public class UserBaseInfoRedis {
                                 default:
                                     buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN);
                             }
+                        }else{
+                            buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN);
+                        }
                         baseInfo.setShowName(buffer.toString());
                     }
                 }