From 0c9c80a147cfa1b1568dcc477f315d62a7b9143b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 09:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=85=B6=E4=BB=96=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E6=97=B6=20=E6=B3=A8=E5=86=8C=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E8=A1=A8=20=E8=A1=A5=E5=85=85=E7=BB=84=E7=BB=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RegisterRelationServiceImpl.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index bf7f42d6f9..d853d884dc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -37,10 +37,10 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
 import com.epmet.feign.GovOrgFeignClient;
@@ -212,8 +212,14 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
                     registerRelationToSave.setFirstRegister(NumConstant.ZERO_STR);
                     registerRelationToSave.setRegister(NumConstant.ZERO_STR);
                     registerRelationToSave.setParticipation(NumConstant.ONE_STR);
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
+                    if(gridInfo != null){
+                        //将要进入的网格id 对应的组织信息放进去
+                        registerRelationToSave.setAgencyId(gridInfo.getPid());
+                        registerRelationToSave.setAgencyIdPath(gridInfo.getPids());
+                        baseDao.insert(registerRelationToSave);
+                    }
 
-                    baseDao.insert(registerRelationToSave);
                 }else{
                     //不存在相同客户不同网格的注册记录(既在这个客户下没有过register_relation记录，没有进过这个客户的网格，这是第一次进入这个客户下的网格)
                     Optional<RegisterRelationEntity> registerRecordWithDiffCustAndGrid =