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

fix:code查询部门

Browse Source
This commit is contained in:
zhuxinru
2026-02-02 20:58:36 +08:00
parent 17288f9f21
commit adb15424ac
6 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,11 +94,12 @@ public class SpdmTenantController {
@PostMapping("/queryUserList")
public R<List<LyricUserDto>> queryUserList(@RequestParam(required = false) String workType) {
ResponseR sdmResponse = spdmServiceFeignClient.queryUserList(workType);
ResponseR<List<LyricUserDto>> sdmResponse = spdmServiceFeignClient.queryUserList(workType);
log.info("[queryUserList] sdmResponse:{}", sdmResponse);
if (sdmResponse.isSuccess() && sdmResponse.getData() != null) {
JSONArray jsonArray = (JSONArray) sdmResponse.getData();
List<LyricUserDto> userToDmList = jsonArray.toJavaList(LyricUserDto.class);
// JSONArray jsonArray = (JSONArray) sdmResponse.getData();
// List<LyricUserDto> userToDmList = jsonArray.toJavaList(LyricUserDto.class);
List<LyricUserDto> userToDmList = sdmResponse.getData();
return R.ok(userToDmList);
} else {
return R.ok(new ArrayList<LyricUserDto>());

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

@@ -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<Page<SysDeptEntity>> result = remoteTenantServiceFeign.listDeptForPage(groupQueryDto, groupQueryDto.getTenantId());
if (result.getData() != null) {
Page<SysDeptEntity> deptForPage = result.getData();

9
honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/dto/GroupQueryDto.java
View File

@@ -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;

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

@@ -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<List<LyricUserDto>> queryUserList(@RequestParam(required = false) String workType);
}

2
honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/controller/SysHrSyncController.java
View File

@@ -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());

3
honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysDeptServiceImpl.java
View File

@@ -146,6 +146,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDeptEntity
if (StringUtils.isNotBlank(sysDept.getDeptName())){
wrapper.like(SysDeptEntity::getDeptName, sysDept.getDeptName());
}
if (StringUtils.isNotBlank(sysDept.getDeptCode())){
wrapper.eq(SysDeptEntity::getDeptCode, sysDept.getDeptCode());
}
return this.page(page,wrapper);
}