Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -24,10 +24,8 @@ import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
@@ -38,7 +36,6 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.VolunteerInfoDao;
@@ -46,11 +43,7 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
-import com.epmet.dto.form.CommonCustomerFormDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.SendVerificationCodeFormDTO;
-import com.epmet.dto.form.VolunteerRegResiFormDTO;
-import com.epmet.dto.form.SystemMsgFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
@@ -80,6 +73,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -236,15 +230,15 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         if (userBaseInfo.success()){
             resultDTO = ConvertUtils.sourceToTarget(userBaseInfo.getData(), ResiVolunteerInfoResultDTO.class);
             // 判断是不是志愿者
-            Integer volunteerFlag = baseDao.queryVolunteerFlagByUserId(tokenDto.getUserId());
-            if (volunteerFlag > NumConstant.ZERO){
-                // 获取志愿者信息
-                VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId());
+            // 获取志愿者信息
+            // Integer volunteerFlag = baseDao.queryVolunteerFlagByUserId(tokenDto.getUserId());
+            VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId());
+            if (null!=dto){
                 resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce() == null ? "" : dto.getVolunteerIntroduce());
                 resultDTO.setVolunteerSignature(dto.getVolunteerSignature() == null ? "" : dto.getVolunteerSignature());
                 // 遗留数据处理，如果表中数据为空，一律返回null，前端重新获取 网格信息
                 resultDTO.setGridId( "".equals(dto.getGridId()) ? null : dto.getGridId());
-                resultDTO.setGridName( "".equals(dto.getGridName()) ? null : dto.getGridName());
+                resultDTO.setGridName( "".equals(dto.getGridName()) ? null  : dto.getGridName());
             }
         } else {
             logger.error("获取用户基本信息失败");