From adb15424ac507e59cb7bdf727b4d38bd53676fa1 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Mon, 2 Feb 2026 20:58:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:code=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../honeycom/spdm/controller/SpdmTenantController.java | 7 ++++--- .../honeycom/spdm/controller/SpdmUserController.java | 2 ++ .../com/honeycombis/honeycom/spdm/dto/GroupQueryDto.java | 9 +++++++++ .../honeycom/spdm/feign/SpdmServiceFeignClient.java | 3 ++- .../honeycom/tenant/controller/SysHrSyncController.java | 2 +- .../honeycom/tenant/service/impl/SysDeptServiceImpl.java | 3 +++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java index 425d779..a0a8571 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java @@ -94,11 +94,12 @@ public class SpdmTenantController { @PostMapping("/queryUserList") public R> queryUserList(@RequestParam(required = false) String workType) { - ResponseR sdmResponse = spdmServiceFeignClient.queryUserList(workType); + ResponseR> sdmResponse = spdmServiceFeignClient.queryUserList(workType); log.info("[queryUserList] sdmResponse:{}", sdmResponse); if (sdmResponse.isSuccess() && sdmResponse.getData() != null) { - JSONArray jsonArray = (JSONArray) sdmResponse.getData(); - List userToDmList = jsonArray.toJavaList(LyricUserDto.class); +// JSONArray jsonArray = (JSONArray) sdmResponse.getData(); +// List userToDmList = jsonArray.toJavaList(LyricUserDto.class); + List userToDmList = sdmResponse.getData(); return R.ok(userToDmList); } else { return R.ok(new ArrayList()); 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 0ecc6e1..bdca2fe 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 @@ -152,6 +152,8 @@ public class SpdmUserController { @Operation(summary = "条件查询用户组列表") @PostMapping(value = "/queryGroup") public ResponseR listGroup(@RequestBody GroupQueryDto groupQueryDto) { + groupQueryDto.setDeptCode(groupQueryDto.getGroupCode()); + groupQueryDto.setDeptName(groupQueryDto.getGroupName()); R> result = remoteTenantServiceFeign.listDeptForPage(groupQueryDto, groupQueryDto.getTenantId()); if (result.getData() != null) { Page deptForPage = result.getData(); diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupQueryDto.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupQueryDto.java index d3e3972..baa5ebe 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupQueryDto.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupQueryDto.java @@ -16,6 +16,15 @@ public class GroupQueryDto { @Schema(description = "用户组名") private String groupName; + @Schema(description = "用户组编码") + private String groupCode; + + @Schema(description="部门编码") + private String deptCode; + + @Schema(description="部门名称") + private String deptName; + @Schema(description = "用户名") private String userName; diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java index 51ba5b4..b4e5817 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java @@ -2,6 +2,7 @@ package com.honeycombis.honeycom.spdm.feign; import com.honeycombis.honeycom.common.core.util.R; import com.honeycombis.honeycom.spdm.dto.ApproveResultDto; +import com.honeycombis.honeycom.spdm.dto.LyricUserDto; import com.honeycombis.honeycom.spdm.dto.SysLogDto; import com.honeycombis.honeycom.spdm.util.ResponseR; import org.springframework.cloud.openfeign.FeignClient; @@ -23,6 +24,6 @@ public interface SpdmServiceFeignClient { ResponseR initNewTenant(@RequestParam Long tenantId); @PostMapping("/lyricUser/queryUserList") - ResponseR queryUserList(@RequestParam(required = false) String workType); + ResponseR> queryUserList(@RequestParam(required = false) String workType); } diff --git a/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/controller/SysHrSyncController.java b/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/controller/SysHrSyncController.java index 9e28b20..19e46b1 100644 --- a/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/controller/SysHrSyncController.java +++ b/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/controller/SysHrSyncController.java @@ -121,7 +121,7 @@ public class SysHrSyncController { for (String workType : userMapByWorkType.keySet()) { log.info("-------------------------开始同步{}的用户数据----------------------", workType); try { - tkMoldService.allSyncLyricUsers(userDtoList, workType); + tkMoldService.allSyncLyricUsers(userMapByWorkType.get(workType), workType); } catch (Exception e) { log.error("全量同步用户数据失败", e); throw new HoneycomException(e.getMessage()); diff --git a/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysDeptServiceImpl.java b/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysDeptServiceImpl.java index 4f376c9..daae3fc 100644 --- a/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysDeptServiceImpl.java +++ b/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysDeptServiceImpl.java @@ -146,6 +146,9 @@ public class SysDeptServiceImpl extends ServiceImpl