Merge branch 'dev_thirdplatform' into dev

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -423,11 +423,26 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         customerEntity.setOrganizationNumber("");
         customerEntity.setOrganizationImg("");
         customerEntity.setValidityTime(getValidityTime());
-        customerEntity.setOrganizationLevel(paAgency.getLevelNum());
+        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.setLogo("");
         if (baseDao.insert(customerEntity) < NumConstant.ONE) {
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
         }
+        if(true){
+            throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
+        }
 
         //3.调用epmet-user服务，初始化客户对应的角色;调用access服务给角色分配权限信息
         Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());