autoreguser-ding

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -579,7 +579,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		UserRoleResultDTO role = userRoleService.getUserResidentRole(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		if (null == role) {
 			resDTO.setGridId(userResiInfoDTO.getGridId());
-			resDTO.setGridName(gridInfo.getGridName());
+			resDTO.setGridName(gridInfo.getGridNamePath());
 			resDTO.setAgencyId(gridInfo.getPid());
 
 			//获取钉钉用户信息
@@ -639,7 +639,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 				if (null == regGridInfo) {
 					throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取注册网格信息失败", "获取注册网格信息失败");
 				}
-				resDTO.setGridName(regGridInfo.getGridName());
+				resDTO.setGridName(regGridInfo.getGridNamePath());
 				resDTO.setAgencyId(regGridInfo.getPid());
 			}
 		}