From 6ad662184c11bec06b910a938e0aa4a9912ca031 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Jul 2020 13:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerServiceImpl.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 4331a01de9..dbd6c2a666 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
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -42,7 +43,6 @@ import com.epmet.feign.OperCustomizeFeignClient;
 import com.epmet.redis.CustomerRedis;
 import com.epmet.service.CustomerService;
 import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -257,20 +257,24 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER);
         Result<GovStaffRoleDTO> getRoleResult = epmetUserFeignClient.getRoleOfCustomer(customerRoleForm);
         if (!getRoleResult.success()) {
+            log.error("查询客户具有指定RoleKey的角色信息失败:".concat(getRoleResult.toString()));
             throw new RenException("查询客户具有指定RoleKey的角色信息失败:".concat(getRoleResult.toString()));
         }
 
         if (getRoleResult.getData() == null) {
+            log.error("未查询到客户具有指定RoleKey的角色信息:".concat(getRoleResult.toString()));
             throw new RenException("未查询到客户具有指定RoleKey的角色信息:".concat(getRoleResult.toString()));
         }
 
         // 查询客户根级组织
         Result<CustomerAgencyDTO> customerRootAgencyResult = govOrgFeignClient.getCustomerRootAgency(form.getCustomerId());
         if (!customerRootAgencyResult.success()) {
+            log.error("查询客户根级组织失败:".concat(getRoleResult.toString()));
             throw new RenException("查询客户根级组织失败:".concat(getRoleResult.toString()));
         }
 
         if (customerRootAgencyResult.getData() == null) {
+            log.error("新增客户管理员失败,没有查询到客户根级组织，无法设置管理员:".concat(getRoleResult.toString()));
             throw new RenException("没有查询到客户根级组织，无法设置管理员:".concat(getRoleResult.toString()));
         }
 
@@ -284,7 +288,8 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         staffSubmitFrom.setRoles(Arrays.asList(getRoleResult.getData().getId()));
         Result result = govOrgFeignClient.addStaff(staffSubmitFrom);
         if (!result.success()) {
-            throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_MANAGER_ERROR.getCode());
+            log.error(String.format("新增客户管理员失败,调用gov-org-server服务异常%s", JSON.toJSONString(result)));
+            throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_MANAGER_ERROR.getCode(),result.getMsg());
         }
     }