From d28f4a170d1d494c70391476b804922d6fb0aca4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 7 Jun 2022 17:47:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=88=BF=E5=B1=8Bbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mine/service/impl/PersonalCenterServiceImpl.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
index a508fffe31..5c4788f7b7 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
+++ b/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());

From c70066224dbdfcab8c04c47a9fd43f7c5e68f761 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Tue, 7 Jun 2022 18:07:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcResiUserConfirmServiceImpl.java     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
index 11da6a1409..ed2bd8e05d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
+++ b/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;
@@ -57,8 +58,8 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
         return ConvertUtils.sourceToTarget(entityList, IcResiUserConfirmDTO.class);
     }
 
-    private QueryWrapper<IcResiUserConfirmEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<IcResiUserConfirmEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IcResiUserConfirmEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -96,11 +97,11 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
     @Override
     public Result editMember(IcResiUserConfirmSubmitDTO dto) {
         IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId());
-        if(null != oldEntity){
+        if (null != oldEntity) {
             dto.setId(oldEntity.getId());
             IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class);
             updateById(entity);
-        }else{
+        } else {
             addMember(dto);
         }
         return new Result().ok("修改成功");
@@ -124,11 +125,11 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
     @Override
     public Result delMember(IcResiUserConfirmSubmitDTO dto) {
         IcResiUserConfirmEntity oldEntity = baseDao.selectByIcResiUserId(dto.getIcResiUserId());
-        if(null != oldEntity){
+        if (null != oldEntity) {
             dto.setId(oldEntity.getId());
             IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserConfirmEntity.class);
             updateById(entity);
-        }else{
+        } else {
             addMember(dto);
         }
         return new Result().ok("删除成功");
@@ -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);
     }
 
@@ -161,7 +165,7 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
                 entity.setName(confirmEntity.getSurname() + confirmEntity.getName());
                 entity.setId(confirmEntity.getIcResiUserId());
                 icResiUserDao.updateById(entity);
-            } else if ("delete".equals(confirmEntity.getSubmitType())){
+            } else if ("delete".equals(confirmEntity.getSubmitType())) {
                 IcResiUserEntity entity = new IcResiUserEntity();
                 entity.setId(confirmEntity.getIcResiUserId());
                 entity.setStatus(confirmEntity.getDeleteReason());