From 2e2894d6825856f996da89b2d990f299ea5cf364 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Oct 2022 15:13:41 +0800
Subject: [PATCH] =?UTF-8?q?/data/aggregator/org/staffdetailv2=E7=9A=84szsq?=
 =?UTF-8?q?Roles=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 6820ef9f8c..e89800fa69 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -736,7 +736,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         getStaffExistRoleFormDTO.setCustomerId(dto.getCustomerId());
         Result<List<NewUserRoleResultDTO>> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO);
         if (staffExistRole.success()&&CollectionUtils.isNotEmpty(staffExistRole.getData())){
-            List<String> szsqRoles=staffExistRole.getData().stream().map(m -> m.getRoleName()).distinct().collect(Collectors.toList());
+            // 过滤selected=true的
+            List<String> szsqRoles=staffExistRole.getData().stream().filter(t->t.getSelected()).map(m -> m.getRoleName()).distinct().collect(Collectors.toList());
             result.setSzsqRoles(szsqRoles);
         }
         return result;