From f903f933681a9ac930dfa2ff9c4c7f55e6bef0af Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 31 Mar 2021 14:36:27 +0800
Subject: [PATCH] =?UTF-8?q?/epmet/ext/user/userinfo=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=99=8D=E7=BA=A7=EF=BC=8C=E4=B8=94=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/UserBaseInfoServiceImpl.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 852ca55843..e779487861 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -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;
     }
 }