diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index b317d5cfe0..dd895ccd93 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.95
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.96
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index aeafbbdde3..bf3734cb65 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.95</version>
+    <version>0.3.96</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
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 215e32b471..140bd8cd43 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
@@ -215,18 +215,22 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<AddGridResultDTO> addGrid(TokenDto tokenDto, AddGridFormDTO addGridFormDTO) {
-        CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(addGridFormDTO.getAgencyId());
+        CustomerAgencyDTO customerAgencyDTO = customerAgencyService.get(addGridFormDTO.getAgencyId());
         // 1. 查询该客户下可创建网格的最大数量
         GridCountFormDTO gridCount = new GridCountFormDTO();
         String customerId = customerAgencyDTO.getCustomerId();
         gridCount.setCustomerId(customerId);
         GridCountResultDTO grid = operCrmOpenFeignClient.getGridCount(gridCount).getData();
-        if (grid.getGridCount().equals(NumConstant.ZERO)){
+        log.info("客户信息为：" + grid);
+        if (null == grid) {
+            throw new RenException("未查出该客户信息");
+        }
+        if (null == grid.getGridCount() || grid.getGridCount().equals(NumConstant.ZERO)) {
             throw new RenException(EpmetErrorCode.GRID_COUNT_UP.getCode());
         }
         // 2. 判断当前客户下存在的网格数量
         Integer gridCounts = customerGridDao.selectGridCount(customerId);
-        if (gridCounts >= grid.getGridCount()){
+        if (gridCounts >= grid.getGridCount()) {
             throw new RenException(EpmetErrorCode.GRID_COUNT_UP.getCode());
         }
         // 3. 查询网格名称是否重名