|
|
@ -383,11 +383,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us |
|
|
|
result.setGender(StringUtils.isNotBlank(userMsg.getGender()) ? userMsg.getGender() : ""); |
|
|
|
//end
|
|
|
|
}else{ |
|
|
|
logger.error("com.epmet.service.impl.UserBaseInfoServiceImpl.extUserInfo,查询不到用户信息,用户Id:{}",param.getUserId()); |
|
|
|
return result; |
|
|
|
logger.warn("com.epmet.service.impl.UserBaseInfoServiceImpl.extUserInfo,user_base_info查询不到用户信息,用户Id:{}",param.getUserId()); |
|
|
|
} |
|
|
|
if(null == currentGrid || StringUtils.isBlank(currentGrid.getGridId())){ |
|
|
|
logger.error("com.epmet.service.impl.UserBaseInfoServiceImpl.extUserInfo,查询不到用户最近访问的网格,用户Id:{}",param.getUserId()); |
|
|
|
logger.error("com.epmet.service.impl.UserBaseInfoServiceImpl.extUserInfo,grid_latest查询不到用户最近访问的网格,用户Id:{}",param.getUserId()); |
|
|
|
return result; |
|
|
|
} |
|
|
|
result.setCustomerId(currentGrid.getCustomerId()); |
|
|
@ -407,9 +406,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us |
|
|
|
|
|
|
|
Result<ExtUserInfoResultDTO> govOrgResult = |
|
|
|
govOrgOpenFeignClient.userInfoExt(result); |
|
|
|
if(govOrgResult.success() && null != govOrgResult.getData()){ |
|
|
|
return govOrgResult.getData();} |
|
|
|
|
|
|
|
if (govOrgResult.success() && null != govOrgResult.getData()) { |
|
|
|
return govOrgResult.getData(); |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|