Merge branch 'dev' into release

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>

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";
+        customerEntity.setOrganizationLevel(paAgency.getLevel());
-        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.setLogo("");
         //新客户默认可以创建三个网格
         customerEntity.setGridNumber(NumConstant.THREE);