diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
index 435b99f213..83b08d384e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@@ -135,7 +135,7 @@ public class UserBaseInfoRedis {
                             && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){
                         String gridFullName = gridResult.getData().getBelongsGridName();
                         baseInfo.setRegisteredGridName(gridFullName);
-                        StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname());
+                        StringBuffer buffer = new StringBuffer(baseInfo.getSurname());
                         switch (baseInfo.getGender()) {
                             case NumConstant.ONE_STR:
                                 buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE);
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 7f9b4077d9..56a5f56400 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
@@ -194,7 +194,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             if(null!=baseInfo){
                 //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
                 //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
-                if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
+                if (StringUtils.isNotBlank(baseInfo.getSurname())) {
                     if ("1".equals(baseInfo.getGender())) {
                         //    男
                         baseInfo.setUserShowName(baseInfo.getSurname().concat("先生"));