From 5417e12d1f960ffb24b6477d0ca60a2e41658c9c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 4 Aug 2020 16:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E7=AB=AF-=E5=AE=A2=E6=88=B7=E8=AF=A6=E6=83=85=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=A0=B9=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=20=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-module/oper-crm/oper-crm-server/pom.xml                   | 2 +-
 .../main/java/com/epmet/service/impl/CustomerServiceImpl.java   | 2 +-
 3 files changed, 3 insertions(+), 3 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 ecd9f3dc51..5a5aacc465 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.60
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.61
     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 5eade0d793..dc4ea9d3fb 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.60</version>
+    <version>0.3.61</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 eeb8e6abd5..55505076e7 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
@@ -329,7 +329,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         if (customerRootAgency != null) {
             StaffRoleFormDTO staffsInRoleForm = new StaffRoleFormDTO();
             staffsInRoleForm.setOrgId(customerRootAgency.getId());
-            staffsInRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER);
+            staffsInRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
             Result<List<GovStaffRoleResultDTO>> managersResult = epmetUserFeignClient.getStaffsInRole(staffsInRoleForm);
             if (!managersResult.success()) {
                 throw new RenException("查询客户详情:查询客户管理员失败:".concat(managersResult.toString()));