Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt

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;