From c4a0cb8ef9d1337bd0b13121c67adb6731f7c169 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 11 May 2023 09:24:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?customerId=E6=96=B0=E5=A2=9E=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/entity/CommunityBuildingManagerEntity.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java
index dc2e57bd94..1c769d2926 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java
@@ -1,5 +1,7 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -21,6 +23,7 @@ public class CommunityBuildingManagerEntity extends BaseEpmetEntity {
     /**
      * 客户Id customer.id
      */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
     /**

From 41fe49d895f7f62fe921338934cc7ad76dae1b58 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 11 May 2023 09:48:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcNeighborHoodServiceImpl.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index f6271ba3b9..f9c10cf973 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -707,9 +707,10 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                             communityBuildingManagerEntity.setViliageId(buildingEntity.getNeighborHoodId());
                             IcNeighborHoodEntity neighborHood =  neighborHoodDao.selectById(buildingEntity.getNeighborHoodId());
                             communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
-                            communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids());
+                            communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId());
 
-                            String[] agencyIds = neighborHood.getAgencyPids().split(":");
+                            List<String> agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":")));
+                            agencyIds.add(neighborHood.getAgencyId());
                             LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
                             List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
                             for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {
@@ -764,9 +765,10 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             communityBuildingManagerEntity.setViliageId(buildingEntity.getNeighborHoodId());
             IcNeighborHoodEntity neighborHood =  neighborHoodDao.selectById(buildingEntity.getNeighborHoodId());
             communityBuildingManagerEntity.setGridId(neighborHood.getGridId());
-            communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids());
+            communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId());
 
-            String[] agencyIds = neighborHood.getAgencyPids().split(":");
+            List<String> agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":")));
+            agencyIds.add(neighborHood.getAgencyId());
             LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper = new LambdaQueryWrapper<CustomerAgencyEntity>().in(CustomerAgencyEntity::getId,agencyIds);
             List<CustomerAgencyEntity> customerAgencyEntities = customerAgencyDao.selectList(queryWrapper);
             for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) {