Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -221,7 +221,11 @@ 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)){
+        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. 判断当前客户下存在的网格数量