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 4e4e20e..8491531 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 @@ -158,7 +158,7 @@ public class SpdmUserController { R> result = remoteTenantServiceFeign.listDeptForPage(groupQueryDto, groupQueryDto.getTenantId()); if (result.getData() != null) { Page deptForPage = result.getData(); - List groupResultDtoList = deptForPage.getRecords().stream().map(i -> new GroupResultDto(i.getDeptId(), i.getDeptName(), i.getCreateTime(), i.getUpdateTime())).collect(Collectors.toList()); + List groupResultDtoList = deptForPage.getRecords().stream().map(i -> new GroupResultDto(i.getDeptId(), i.getDeptCode(), i.getDeptName(), i.getCreateTime(), i.getUpdateTime())).collect(Collectors.toList()); return ResponseR.ok(PageResult.of(deptForPage.getTotal(), deptForPage.getCurrent(), deptForPage.getSize(), groupResultDtoList)); } return ResponseR.ok(); @@ -189,7 +189,7 @@ public class SpdmUserController { JSONObject jsonObject = new JSONObject(); R deptEntityR = remoteTenantServiceFeign.queryDeptById(Long.valueOf(groupQueryDto.getId()), groupQueryDto.getTenantId()); if (deptEntityR.getData() != null) { - jsonObject.put("sysUserGroup", new GroupResultDto(deptEntityR.getData().getDeptId(), deptEntityR.getData().getDeptName(), deptEntityR.getData().getCreateTime(), deptEntityR.getData().getUpdateTime())); + jsonObject.put("sysUserGroup", new GroupResultDto(deptEntityR.getData().getDeptId(), deptEntityR.getData().getDeptCode(), deptEntityR.getData().getDeptName(), deptEntityR.getData().getCreateTime(), deptEntityR.getData().getUpdateTime())); R> sysStaffPageR = remoteTenantServiceFeign.listStaffForPage(StaffPageQueryDto.builder().deptId(groupQueryDto.getId()).current(groupQueryDto.getCurrent()).size(groupQueryDto.getSize()).build(), groupQueryDto.getTenantId()); Page staffPage = sysStaffPageR.getData(); if (staffPage != null) { diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupResultDto.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupResultDto.java index 397e306..f44df42 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupResultDto.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupResultDto.java @@ -16,6 +16,9 @@ public class GroupResultDto { @Schema(description = "用户组ID") private Long id; + @Schema(description = "用户组编码") + private String groupCode; + @Schema(description = "用户组名") private String groupName;