Merge remote-tracking branch 'origin/master'

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 =