From fe87bb10190e8718b45c4e839040c3adb881309f Mon Sep 17 00:00:00 2001 From: liuyang Date: Mon, 23 Dec 2024 16:29:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:[REQ-3282]=20=E8=A7=A3=E5=86=B3=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/orgjob/repository/OrgJobQueryRepository.java | 2 +- .../orgjob/repository/impl/OrgJobQueryRepositoryImpl.java | 8 ++++---- .../server/node/service/impl/NodeServiceImpl.java | 2 +- .../nodeuser/foundation/NodeUserFoundationService.java | 2 +- .../foundation/impl/NodeUserFoundationServiceImpl.java | 2 +- .../foundation/impl/OrgJobFoundationServiceImpl.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java index b011306..ac58336 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java @@ -30,7 +30,7 @@ public interface OrgJobQueryRepository { * @param req * @return */ - default List list(ListReq req) { + default List list(ListReq req) { PageResp page = page(req); if (page == null) { return Collections.emptyList(); diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java index 47e1187..48c6e80 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java @@ -25,16 +25,16 @@ public class OrgJobQueryRepositoryImpl implements OrgJobQueryRepository { private final OrgJobDao orgJobDao; @Override - public PageResp page(ListReq req) { + public PageResp page(ListReq req) { IPage page = PageConverter.toMybatis(req, OrgJob.class); QueryWrapper wrapper = QueryWrapperHelper.fromBean(req, OrgJob.class); if (wrapper.isEmptyOfWhere()) { - return PageResp.builder().build(); + return PageResp.builder().build(); } IPage results = orgJobDao.page(page, wrapper) .convert(e -> BeanUtil.toBean(e, OrgJob.class)); - PageResp resp = PageConverter.toResp(results); - List records = resp.getData(); + PageResp resp = PageConverter.toResp(results); + List records = resp.getData(); if (CollUtil.isEmpty(records)) { return resp; } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java index d177add..45cb926 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java @@ -83,7 +83,7 @@ public class NodeServiceImpl implements NodeService { // 获取岗位信息 if (CollUtil.isNotEmpty(req.getJobCodes())) { - List orgJobs = orgJobQueryRepository.list(OrgJobQueryRepository.ListReq.builder() + List orgJobs = orgJobQueryRepository.list(OrgJobQueryRepository.ListReq.builder() .ids(CollUtil.map(nodeUsers, OrganizationalNodeUser::getOrganizationalJobId, true)) .codes(req.getJobCodes()) .build()); diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java index 2ba3c52..450e7f6 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java @@ -33,5 +33,5 @@ public interface NodeUserFoundationService { * @param nodeUsers * @param orgJobs */ - void filterByJobs(List nodeUsers, List orgJobs); + void filterByJobs(List nodeUsers, List orgJobs); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java index 8f562e3..fbb9941 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java @@ -135,7 +135,7 @@ public class NodeUserFoundationServiceImpl implements NodeUserFoundationService } @Override - public void filterByJobs(List nodeUsers, List orgJobs) { + public void filterByJobs(List nodeUsers, List orgJobs) { List jobIds = CollUtil.map(orgJobs, OrgJob::getId, true); nodeUsers.removeIf(e -> !jobIds.contains(e.getOrganizationalJobId())); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java index 4b7e3e6..8822095 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java @@ -40,7 +40,7 @@ public class OrgJobFoundationServiceImpl implements OrgJobFoundationService { @Override public PageResp page(ListOrgJobReq req) { - PageResp page = orgJobQueryRepository.page(BeanUtil.copyProperties(req, OrgJobQueryRepository.ListReq.class)); + PageResp page = orgJobQueryRepository.page(BeanUtil.copyProperties(req, OrgJobQueryRepository.ListReq.class)); return PageResp.builder() .size(page.getSize()) .current(page.getCurrent())