shishi

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

@@ -619,14 +619,14 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			//居民角色对应的网格Id存默认值-all
 			userRoleDTO.setGridId(UserRoleConstant.DEFAULT_GRID_ID);
 			userRoleService.saveUserRole(userRoleDTO);
-			//4:保存baseInfo
+			//4:记录用户的注册网格register_relation
+			registerRelationService.saveRegisterRelation(userResiInfoDTO);
+			//5:保存baseInfo
 			UserBaseInfoEntity baseInfo = ConvertUtils.sourceToTarget(userResiInfoDTO, UserBaseInfoEntity.class);
 			baseInfo.setMobile(userResiInfoDTO.getRegMobile());
 			baseInfo.setSurname(NameUtils.getSurNameComplex(userInfo.getRealName()));
 			baseInfo.setName(NameUtils.getNameComplex(userInfo.getRealName()));
 			userBaseInfoService.insertOrUpdate(baseInfo);
-			//5:记录用户的注册网格register_relation
-			registerRelationService.saveRegisterRelation(userResiInfoDTO);
 		}else{
 			//已经是注册居民了
 			LambdaQueryWrapper<RegisterRelationEntity> registerWrapper = new LambdaQueryWrapper<>();