From 9eea989bf29e9e39ec825898343efa5e113a2f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 2 Aug 2024 10:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=A3=E7=BC=B4=E4=B9=89?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E7=9A=84=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
index eb80a49af..6370d3f05 100644
--- a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
+++ b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
@@ -176,7 +176,7 @@ public class TaxAgentBO {
                     map.put("id", e.getId());
                     map.put("name", e.getName());
                     map.put("employeeRange", "设置");
-                    map.put("role", rolelistMap.getOrDefault(e.getId(), Collections.emptyList()));
+                    map.put("role", rolelistMap.getOrDefault(e.getId(), Collections.emptyList()).stream().map(AuthRolePO::getName).collect(Collectors.joining(",")));
                     if (isDevolution) {
                         List<Long> empIds = taxAgentAdmins.stream().filter(t -> t.getTaxAgentId().equals(e.getId())).map(TaxAgentAdminPO::getEmployeeId).collect(Collectors.toList());
                         List<String> admins = adminList.stream().filter(a -> empIds.contains(a.getEmployeeId())).map(DataCollectionEmployee::getUsername).collect(Collectors.toList());