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

fix:查询用户列表

Browse Source
This commit is contained in:
zhuxinru
2026-02-03 09:49:21 +08:00
parent adb15424ac
commit f76f53507e
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,32 +80,33 @@ public class SpdmUserController {
@Operation(summary = "条件查询用户列表")
@PostMapping(value = "/listUser")
public ResponseR listUser(@RequestBody UserPageQueryDto userPageQueryDto) {
// R<Page<StaffPageResultDto>> sysStaffPageR = remoteTenantServiceFeign.listStaffForPage(
// StaffPageQueryDto.builder()
// .tenantId(userPageQueryDto.getTenantId())
// .nickname(userPageQueryDto.getNickname())
// .current(userPageQueryDto.getCurrent()).size(userPageQueryDto.getSize())
// .build(),
// userPageQueryDto.getTenantId());
// Page<StaffPageResultDto> staffPage = sysStaffPageR.getData();
// if (staffPage != null) {
R<Page<StaffPageResultDto>> sysStaffPageR = remoteTenantServiceFeign.listStaffForPage(
StaffPageQueryDto.builder()
.tenantId(userPageQueryDto.getTenantId())
.nickname(userPageQueryDto.getNickname())
.current(userPageQueryDto.getCurrent()).size(userPageQueryDto.getSize())
.build(),
userPageQueryDto.getTenantId());
Page<StaffPageResultDto> staffPage = sysStaffPageR.getData();
if (staffPage != null) {
// List<SysUserVO> userVOList = new ArrayList<>();
// staffPage.getRecords().forEach(i -> {
// R<SysUserVO> sysUserVO = remoteUserServiceFeign.getUserByUserId(Long.valueOf(i.getUserId()), SecurityConstants.FROM_IN, userPageQueryDto.getTenantId());
// userVOList.add(sysUserVO.getData());
// });
// return ResponseR.ok(PageResult.of(staffPage.getTotal(), staffPage.getCurrent(), staffPage.getSize(), userVOList));
// }
UserPageQueryDto queryDto = new UserPageQueryDto();
queryDto.setNickname(userPageQueryDto.getNickname());
queryDto.setTenantId(userPageQueryDto.getTenantId());
queryDto.setCurrent(userPageQueryDto.getCurrent());
queryDto.setSize(userPageQueryDto.getSize());
R<Page<SysUserVO>> listUserForPageR = remoteUserServiceFeign.listUserForPage(queryDto, userPageQueryDto.getTenantId());
if (listUserForPageR.isSuccess() && listUserForPageR.getData() != null) {
Page<SysUserVO> listUserForPage = listUserForPageR.getData();
return ResponseR.ok(PageResult.of(listUserForPage.getTotal(), listUserForPage.getCurrent(), listUserForPage.getSize(), listUserForPage.getRecords()));
List<SysUserVO> userVOList = staffPage.getRecords().stream().map(StaffPageResultDto::getUserInfo).toList();
return ResponseR.ok(PageResult.of(staffPage.getTotal(), staffPage.getCurrent(), staffPage.getSize(), userVOList));
}
// UserPageQueryDto queryDto = new UserPageQueryDto();
// queryDto.setNickname(userPageQueryDto.getNickname());
// queryDto.setTenantId(userPageQueryDto.getTenantId());
// queryDto.setCurrent(userPageQueryDto.getCurrent());
// queryDto.setSize(userPageQueryDto.getSize());
// R<Page<SysUserVO>> listUserForPageR = remoteUserServiceFeign.listUserForPage(queryDto, userPageQueryDto.getTenantId());
// if (listUserForPageR.isSuccess() && listUserForPageR.getData() != null) {
// Page<SysUserVO> listUserForPage = listUserForPageR.getData();
// return ResponseR.ok(PageResult.of(listUserForPage.getTotal(), listUserForPage.getCurrent(), listUserForPage.getSize(), listUserForPage.getRecords()));
// }
return ResponseR.ok();
}