Merge branch 'feature/dev_sunjiatan'

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java

@@ -28,11 +28,14 @@ public class PersonalCenterServiceImpl implements PersonalCenterService {
 
 	@Override
 	public InitInfoResultDTO initInfo(TokenDto tokenDto) {
+		InitInfoResultDTO resultDTO = new InitInfoResultDTO();
 		Result<ResiUserBaseInfoResultDTO> baseInfoResult = epmetUserOpenFeignClient.selectUserBaseInfo(tokenDto);
-		if (!baseInfoResult.success() || null == baseInfoResult.getData()) {
+		if (!baseInfoResult.success()) {
 			throw new RenException(baseInfoResult.getCode(), baseInfoResult.getMsg());
 		}
-		InitInfoResultDTO resultDTO = new InitInfoResultDTO();
+		if (null == baseInfoResult.getData()) {
+			return resultDTO;
+		}
 		resultDTO.setHeadImgUrl(baseInfoResult.getData().getHeadImgUrl());
 		resultDTO.setSurname(baseInfoResult.getData().getSurname());
 		resultDTO.setName(baseInfoResult.getData().getName());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -137,6 +138,9 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
     @Override
     public Result<IcResiUserConfirmDTO> getMemberDetail(IcResiUserConfirmGetDTO dto) {
         IcResiUserConfirmDTO result = icResiUserDao.selectMemberDetail(dto.getIcResiUserId());
+        if (null != result && StringUtils.isBlank(result.getGender())) {
+            result.setGender(GenderEnum.UN_KNOWN.getCode());
+        }
         return new Result().ok(result);
     }