From 0899e2525fe81175f1e4b80d4d273ea5a8993db6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 26 May 2020 18:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=AE=A2=E6=88=B7opercrm?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/docker-compose-dev.yml             |  2 +-
 epmet-module/oper-crm/oper-crm-server/pom.xml |  2 +-
 .../service/impl/CustomerServiceImpl.java     | 26 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
index 62c4d74141..c8aef66db1 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.17
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.18
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 61a8871f91..96cc6db51b 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.17</version>
+    <version>0.3.18</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>
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 9510e0631d..5be3930e4c 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
@@ -229,19 +229,19 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
         }
 
-        //// 2. 给客户初始化角色列表
-        //Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
-        //if (!initResult.success()) {
-        //    throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
-        //}
-        //
-        ////3. 给客户初始化 定制化首页
-        //CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
-        //initHomeForm.setCustomerId(customerEntity.getId());
-        //Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
-        //if (!initHomeResult.success()) {
-        //    throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
-        //}
+        // 2. 给客户初始化角色列表
+        Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
+        if (!initResult.success()) {
+            throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
+        }
+
+        //3. 给客户初始化 定制化首页
+        CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
+        initHomeForm.setCustomerId(customerEntity.getId());
+        Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
+        if (!initHomeResult.success()) {
+            throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
+        }
 
         return customerEntity.getId();
     }