From a9db5a17680dbc4269068741aa8aa9996cc8402a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 2 Aug 2022 13:48:00 +0800
Subject: [PATCH] =?UTF-8?q?editStaffInit=E5=B0=91=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomerStaffServiceImpl.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 ef8f079c56..77af73c96d 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
@@ -25,6 +25,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -49,6 +50,7 @@ import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.entity.StaffRoleEntity;
 import com.epmet.entity.UserEntity;
 import com.epmet.feign.AuthFeignClient;
+import com.epmet.feign.GovAccessFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.service.CustomerStaffService;
@@ -94,6 +96,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
     private GovStaffRoleDao govStaffRoleDao;
     @Autowired
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
+    @Autowired
+    private GovAccessFeignClient govAccessFeignClient;
 
     @Override
     public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
@@ -283,7 +287,16 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
             }
         }));
         resultDTO.setRoleList(staffRoleList);
-
+        // 获取新角色
+        GetStaffExistRoleFormDTO getStaffExistRoleFormDTO = ConvertUtils.sourceToTarget(fromDTO, GetStaffExistRoleFormDTO.class);
+        Result<List<NewUserRoleResultDTO>> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO);
+        if (!staffExistRole.success()){
+            throw new EpmetException("getStaffExistRole method is failure");
+        }
+        if (!CollectionUtils.isEmpty(staffExistRole.getData())){
+            List<StaffRoleResultDTO> staffRoleResultDTOS = ConvertUtils.sourceToTarget(staffExistRole.getData(), StaffRoleResultDTO.class);
+            resultDTO.setNewRoleList(staffRoleResultDTOS);
+        }
         return new Result<StaffInitResultDTO>().ok(resultDTO);
     }