From 96f2ee1a281a63b95d450bc5c601942070cbe3ce Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 Aug 2020 15:26:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?customer=E8=A1=A8=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E7=BB=84=E7=BB=87=E7=BA=A7=E5=88=AB=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=97=AE=E9=A2=98=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E4=B8=8D=E5=AD=98=E6=95=B0=E6=8D=AE=E5=AD=98key?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/CustomerServiceImpl.java    | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

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..4ce8fb2412 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
@@ -460,19 +460,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         customerEntity.setOrganizationNumber("");
         customerEntity.setOrganizationImg("");
         customerEntity.setValidityTime(getValidityTime());
-        String level = "5";
-        if("province".equals(paAgency.getLevel())){
-            level = "0";
-        }else if("city".equals(paAgency.getLevel())){
-            level = "1";
-        }else if("district".equals(paAgency.getLevel())){
-            level = "2";
-        }else if("street".equals(paAgency.getLevel())){
-            level = "3";
-        }else if("community".equals(paAgency.getLevel())){
-            level = "4";
-        }
-        customerEntity.setOrganizationLevel(level);
+        customerEntity.setOrganizationLevel(paAgency.getLevel());
         customerEntity.setLogo("");
         //新客户默认可以创建三个网格
         customerEntity.setGridNumber(NumConstant.THREE);

From daf684d80057f70771d424010ab7fecef8a23534 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 26 Aug 2020 15:41:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index cd3d7832e0..80da83c9fc 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-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.69</version>
+    <version>0.3.70</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>