From 2172536ad61917d724b1434fb3cf64a61526514d Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Mon, 8 Dec 2025 16:46:45 +0800 Subject: [PATCH] =?UTF-8?q?spdm=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../honeycom/spdm/controller/SpdmUserController.java | 9 ++++++++- .../honeycom/spdm/feign/RemoteTenantServiceFeign.java | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmUserController.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmUserController.java index 67182d4..3b2f5fb 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmUserController.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmUserController.java @@ -177,7 +177,14 @@ public class SpdmUserController { byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes(StandardCharsets.UTF_8)); String authHeader = "Basic " + new String(encodedAuth); - R tokenDTOR = remoteAuthServiceFeign.getClientUserToken(userParamDto.getUserId(), Long.valueOf(userParamDto.getTenantId()), authHeader); + Long tenantId = 1979091834410176514L; + R> staffListReturn = remoteTenantServiceFeign.findStaffListByUserId(userParamDto.getUserId(), SecurityConstants.FROM_IN); + List staffList = staffListReturn.getData(); + if (CollectionUtils.isNotEmpty(staffList)) { + tenantId = staffList.get(0).getTenantId(); + } + + R tokenDTOR = remoteAuthServiceFeign.getClientUserToken(userParamDto.getUserId(), tenantId, authHeader); TokenDTO tokenDTO = tokenDTOR.getData(); tokenDTO.setCid_user_id(String.valueOf(userParamDto.getUserId())); tokenDTO.setCid_tenant_id(userParamDto.getTenantId()); diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java index affdbcb..a89481f 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java @@ -45,4 +45,7 @@ public interface RemoteTenantServiceFeign { @GetMapping("/sysStaff/page") R> listStaffForPage(@SpringQueryMap StaffPageQueryDto pageQueryDto, @RequestHeader(CommonConstants.TENANT_ID) String tenantIdHeader); + @GetMapping("/sysStaff/findStaffListByUserId") + R> findStaffListByUserId(@RequestParam Long userId, @RequestHeader(SecurityConstants.FROM) String from); + }