From 6a26632af9ec5715e87b57b0f1f632ec82f48c56 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 10 Sep 2020 14:42:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=99=BB=E9=99=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=EF=BC=88=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=AB=AF=EF=BC=89,=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerStaffServiceImpl.java        | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 72f9c416b2..ec85e7b960 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -626,23 +626,25 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         for (CustomerStaffDTO staffDTO : customerStaffList){
             //  2.根据 customer_id 去 gov_staff_role表，查询  customer_id + role_key = root_manager ,确定 根管理员的id，即roleId
             GovStaffRoleDTO roleKey = govStaffRoleDao.getRoleByCustomerIdAndRoleKey(staffDTO.getCustomerId(), RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
-            //  3.根据roleId + staff_id(即 userId) 查 staff_role表的主键id, 如果查到了，那这个userId就是 根管理员
-            StaffRoleDTO staffRoleDTO = staffRoleDao.selectStaffRoleByStaffIdAndRoleId(staffDTO.getUserId(), roleKey.getId());
-            if (null != staffRoleDTO){
-                //  4.如果userID是根管理员的话，则根据customerId 去 customer表 查询 id、customer_name
-                customerDTO.setId(staffDTO.getCustomerId());
-                Result<CustomerDTO> customerInfo = operCrmOpenFeignClient.getCustomerInfo(customerDTO);
-                if (!customerInfo.success()) {
-                    logger.error(String.format("获取根管理员信息失败，调用%s服务查询客户名称失败,入参%s", ServiceConstant.OPER_CRM_SERVER, JSON.toJSONString(staffDTO.getCustomerId())));
-                } else {
-                    if (null != customerInfo.getData()){
-                        CustomerListResultDTO resultDTO = new CustomerListResultDTO();
-                        resultDTO.setCustomerId(customerInfo.getData().getId());
-                        resultDTO.setCustomerName(customerInfo.getData().getCustomerName());
-                        listResultDTO.add(resultDTO);
-                    }
-                }
-            }
+            if (null != roleKey){
+				//  3.根据roleId + staff_id(即 userId) 查 staff_role表的主键id, 如果查到了，那这个userId就是 根管理员
+				StaffRoleDTO staffRoleDTO = staffRoleDao.selectStaffRoleByStaffIdAndRoleId(staffDTO.getUserId(), roleKey.getId());
+				if (null != staffRoleDTO){
+					//  4.如果userID是根管理员的话，则根据customerId 去 customer表 查询 id、customer_name
+					customerDTO.setId(staffDTO.getCustomerId());
+					Result<CustomerDTO> customerInfo = operCrmOpenFeignClient.getCustomerInfo(customerDTO);
+					if (!customerInfo.success()) {
+						logger.error(String.format("获取根管理员信息失败，调用%s服务查询客户名称失败,入参%s", ServiceConstant.OPER_CRM_SERVER, JSON.toJSONString(staffDTO.getCustomerId())));
+					} else {
+						if (null != customerInfo.getData()){
+							CustomerListResultDTO resultDTO = new CustomerListResultDTO();
+							resultDTO.setCustomerId(customerInfo.getData().getId());
+							resultDTO.setCustomerName(customerInfo.getData().getCustomerName());
+							listResultDTO.add(resultDTO);
+						}
+					}
+				}
+			}
         }
 		return new Result<List<CustomerListResultDTO>>().ok(listResultDTO);
 	}