From 7f4123c5cffd14dc662642663756c6f1ed3d3452 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 17 Mar 2022 15:38:01 +0800
Subject: [PATCH] merge

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 b63db4f280..c337f989e3 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
@@ -992,7 +992,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public void abandonGridForDealBizData(AbandonGridFormDTO formDTO) {
         try {
             //根据网格id 获取网格内工作人员及其添加关系
-            List<StaffOrgRelationDTO> staffList = customerStaffGridDao.getGridStaffList(gridId);
+            List<StaffOrgRelationDTO> staffList = customerStaffGridDao.getGridStaffList(formDTO.getGridId());
             if (staffList == null){
                 staffList = new ArrayList<>();
             }
@@ -1017,7 +1017,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             });
             String customerId = loginUserUtil.getLoginUserCustomerId();
             //更新工作人员组织关系
-            dealBizDataForAbandon(customerId,gridId, staffList, updateList);
+            dealBizDataForAbandon(customerId,formDTO.getGridId(),formDTO.getUserId(), staffList, updateList);
             //清空工作人员缓存
             staffList.forEach(staff->CustomerStaffRedis.delStaffInfoFormCache(customerId,staff.getStaffId()));