From 6e6190e7e7e123642266ab60f4df3aff435ac35a Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 16 Mar 2022 16:38:47 +0800
Subject: [PATCH] shuju cuowu

---
 .../com/epmet/service/impl/CustomerGridServiceImpl.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index cb55c5a7ca..87b3c6163e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -38,6 +38,7 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -1017,12 +1018,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
                     StaffOrgRelationEntity entity = new StaffOrgRelationEntity();
                     entity.setId(staffOrg.getId());
                     entity.setOrgType(OrgTypeEnum.AGENCY.getCode());
-                    String pid = CustomerOrgRedis.getGridInfo(staffOrg.getStaffId()).getPid();
-                    if (StringUtils.isBlank(pid)){
-                        log.error("abandonGridForDealBizData agencyId:{} is not exist",pid);
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(staffOrg.getOrgId());
+                    if (gridInfo == null || StringUtils.isBlank(gridInfo.getPid())){
+                        log.error("abandonGridForDealBizData agencyId:{} is not exist",gridInfo.getPid());
                         return;
                     }
-                    entity.setOrgId(pid);
+                    entity.setOrgId(gridInfo.getPid());
                     updateList.add(entity);
                 }
             });