From b09dc7b23e6cc990a2af32438732c4b5f7271dcc Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 11 Aug 2020 16:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=8C=E8=B5=8B=E5=80=BC=E5=A4=84=E7=90=86-=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E5=8E=86=E5=8F=B2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/VolunteerInfoServiceImpl.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 7357735fab..3f4574cacd 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -151,8 +151,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
                 VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId());
                 resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce() == null ? "" : dto.getVolunteerIntroduce());
                 resultDTO.setVolunteerSignature(dto.getVolunteerSignature() == null ? "" : dto.getVolunteerSignature());
-                resultDTO.setGridId(dto.getGridId() == null ? null : dto.getGridId());
-                resultDTO.setGridName(dto.getGridName() == null ? null : dto.getGridName());
+                // 遗留数据处理，如果表中数据为空，一律返回null，前端重新获取 网格信息
+                resultDTO.setGridId( "".equals(dto.getGridId()) ? null : dto.getGridId());
+                resultDTO.setGridName( "".equals(dto.getGridName()) ? null : dto.getGridName());
             }
         } else {
             logger.error("获取用户基本信息失败");