From fe912534cbfd5641b4457cf79622bcc22d1a1f37 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 3 Jun 2020 18:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/feign/OperCrmFeignClient.java    | 1 +
 .../com/epmet/feign/fallback/OperCrmFeignClientFallBack.java | 1 +
 .../epmet/service/impl/CustomerStaffAgencyServiceImpl.java   | 5 +++--
 .../main/java/com/epmet/service/impl/StaffServiceImpl.java   | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
index deb9673714..fe0bf224ab 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.form.CustomerFormDTO;
+import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
index c27aa3a585..9f405caca4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.form.CustomerFormDTO;
+import com.epmet.feign.OperCrmFeignClient;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
index c13a634b39..17f9f75731 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
@@ -20,21 +20,22 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerStaffAgencyDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.CommonDepartmentFormDTO;
+import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.CommonUserIdListFormDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
-import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerStaffAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerDepartmentService;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 355765d9a6..32ec8df9ab 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -12,6 +12,7 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerStaffAgencyService;
 import com.epmet.service.StaffService;