Merge branch 'yantai_zhengwu_master' into dev

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;
 
     /**

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) {