zhuxinru/cid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:queryGroup新增用户组编码

Browse Source
This commit is contained in:
zhuxinru
2026-02-05 19:22:13 +08:00
parent 732de1b04e
commit 5fbc94bc46
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmUserController.java
View File

@@ -158,7 +158,7 @@ public class SpdmUserController {
R<Page<SysDeptEntity>> result = remoteTenantServiceFeign.listDeptForPage(groupQueryDto, groupQueryDto.getTenantId());
if (result.getData() != null) {
Page<SysDeptEntity> deptForPage = result.getData();
List<GroupResultDto> groupResultDtoList = deptForPage.getRecords().stream().map(i -> new GroupResultDto(i.getDeptId(), i.getDeptName(), i.getCreateTime(), i.getUpdateTime())).collect(Collectors.toList());
List<GroupResultDto> 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<SysDeptEntity> 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<Page<StaffPageResultDto>> sysStaffPageR = remoteTenantServiceFeign.listStaffForPage(StaffPageQueryDto.builder().deptId(groupQueryDto.getId()).current(groupQueryDto.getCurrent()).size(groupQueryDto.getSize()).build(), groupQueryDto.getTenantId());
Page<StaffPageResultDto> staffPage = sysStaffPageR.getData();
if (staffPage != null) {

3
honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupResultDto.java
View File

@@ -16,6 +16,9 @@ public class GroupResultDto {
@Schema(description = "用户组ID")
private Long id;
@Schema(description = "用户组编码")
private String groupCode;
@Schema(description = "用户组名")
private String groupName;