From 2855f692485e66438b4429454f03904927ff5d45 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Sep 2020 16:24:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?add=E7=BD=91=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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..cbe32369b6 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
@@ -221,7 +221,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         String customerId = customerAgencyDTO.getCustomerId();
         gridCount.setCustomerId(customerId);
         GridCountResultDTO grid = operCrmOpenFeignClient.getGridCount(gridCount).getData();
-        if (grid.getGridCount().equals(NumConstant.ZERO)){
+        if (null == grid.getGridCount() || grid.getGridCount().equals(NumConstant.ZERO)) {
             throw new RenException(EpmetErrorCode.GRID_COUNT_UP.getCode());
         }
         // 2. 判断当前客户下存在的网格数量

From 1b9b66c89d9002adcb8d5156163c3e717d0c49b3 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Sep 2020 16:39:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?add=E7=BD=91=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerGridServiceImpl.java   | 8 ++++++--
 1 file changed, 6 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 cbe32369b6..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();
+        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. 查询网格名称是否重名

From 5827b2229ed47193e212e86f54d232ceb5e7449d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Sep 2020 16:42:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?add=E7=BD=91=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-org/gov-org-server/deploy/docker-compose-dev.yml        | 2 +-
 epmet-module/gov-org/gov-org-server/pom.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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>