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-02 17:58:13 +08:00
parent 38048f94e0
commit 17288f9f21
12 changed files with 171 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java
View File

@@ -93,7 +93,7 @@ public class SpdmTenantController {
}
@PostMapping("/queryUserList")
public R<List<LyricUserDto>> queryUserList(@RequestParam String workType) {
public R<List<LyricUserDto>> queryUserList(@RequestParam(required = false) String workType) {
ResponseR sdmResponse = spdmServiceFeignClient.queryUserList(workType);
log.info("[queryUserList] sdmResponse:{}", sdmResponse);
if (sdmResponse.isSuccess() && sdmResponse.getData() != null) {

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

@@ -80,21 +80,31 @@ 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) {
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));
// 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()));
}
return ResponseR.ok();
}

2
honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteUserServiceFeign.java
View File

@@ -25,7 +25,7 @@ public interface RemoteUserServiceFeign {
@GetMapping("/user/infoByAccount/{phone}")
R<SysUserInfoVO> infoByAccount(@PathVariable String phone, @RequestHeader(SecurityConstants.FROM) String from, @RequestHeader(CommonConstants.TENANT_ID) String tenantId);
@GetMapping("/user/page/inner")
R<Page<UserPageResultDto>> listUserForPage(@SpringQueryMap UserPageQueryDto sysUser);
R<Page<SysUserVO>> listUserForPage(@SpringQueryMap UserPageQueryDto sysUser, @RequestHeader(CommonConstants.TENANT_ID) String tenantId);
@GetMapping("/user/getUserListByUserName")
R<List<SysUserVO>> getUserListByUserName(@RequestParam("username") String userName);

2
honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java
View File

@@ -23,6 +23,6 @@ public interface SpdmServiceFeignClient {
ResponseR initNewTenant(@RequestParam Long tenantId);
@PostMapping("/lyricUser/queryUserList")
ResponseR queryUserList(@RequestParam String workType);
ResponseR queryUserList(@RequestParam(required = false) String workType);
}