From 03d56aa35459a2d05e1a6c0d9a2383dd6807e117 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 14:45:20 +0800
Subject: [PATCH] =?UTF-8?q?NEI=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/UpdateCustomerParameterFormDTO.java    | 2 +-
 .../main/java/com/epmet/service/impl/CustomerServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
index f522bfab50..ddf4551a57 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateCustomerParameterFormDTO.java
@@ -25,7 +25,7 @@ public class UpdateCustomerParameterFormDTO implements Serializable {
     /**
      * 最大允许创建网格数
      */
-    private Integer gridNumber;
+    private Integer maxGridNumber;
 
     public interface Customer{}
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 323388de35..759c1eeae2 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -691,7 +691,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             throw new RenException(ModuleConstant.SELECT_CUSTOMER_ERROR);
         }
         //2.校验数据合格性
-        if (entity.getGridNumber() > formDTO.getGridNumber()) {
+        if (entity.getGridNumber() > formDTO.getMaxGridNumber()) {
             throw new RenException(ModuleConstant.GRID_NUMBER_ERROR);
         }
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -703,7 +703,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         //3.更新数据
         CustomerEntity customerEntity = new CustomerEntity();
         customerEntity.setId(formDTO.getCustomerId());
-        customerEntity.setGridNumber(formDTO.getGridNumber());
+        customerEntity.setGridNumber(formDTO.getMaxGridNumber());
         customerEntity.setValidityTime(dt1);
         if (baseDao.updateById(customerEntity) < NumConstant.ONE) {
             throw new RenException(ModuleConstant.UPDATE_CUSTOMER_ERROR);