From 25e787cca9cdef153a6a86f31f43bd5dd21681a3 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 17 Aug 2023 16:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BC=93=E5=AD=98=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/UserBaseInfoServiceImpl.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 2b61ff57f5..c9750fcbc0 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
@@ -706,6 +706,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             }
             result.setEpmetUserId(baseInfo.getId());
             // 新增网格关系 先查询有没有网格关系
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId());
+            if (null == gridInfo) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格失败", "获取网格失败");
+            }
             LambdaQueryWrapper<RegisterRelationEntity> registerWrapper = new LambdaQueryWrapper<>();
             registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId());
             registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId());
@@ -717,10 +721,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 registerRelation.setCustomerId(formDTO.getCustomerId());
                 registerRelation.setGridId(formDTO.getGridId());
                 //表中新增字段 为其赋值
-                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId());
-                if (null == gridInfo) {
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存失败", "获取网格缓存失败");
-                }
+
                 registerRelation.setAgencyId(gridInfo.getPid());
                 registerRelation.setAgencyIdPath(gridInfo.getPids());
                 registerRelation.setUserId(baseInfo.getUserId());