wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:[REQ-3282] 解决报错问题

Browse Source
This commit is contained in:
liuyang 2024-12-23 16:29:38 +08:00
parent dfc0b93b93
commit fe87bb1019
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java
View File

@ -30,7 +30,7 @@ public interface OrgJobQueryRepository {
* @param req * @param req
* @return * @return
*/ */
default List<OrgJob> list(ListReq req) { default List<JobResp> list(ListReq req) {
PageResp<JobResp> page = page(req); PageResp<JobResp> page = page(req);
if (page == null) { if (page == null) {
return Collections.emptyList(); return Collections.emptyList();

8
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/impl/OrgJobQueryRepositoryImpl.java
View File

@ -25,16 +25,16 @@ public class OrgJobQueryRepositoryImpl implements OrgJobQueryRepository {
private final OrgJobDao orgJobDao; private final OrgJobDao orgJobDao;
@Override @Override
public PageResp<OrgJob> page(ListReq req) { public PageResp<JobResp> page(ListReq req) {
IPage<OrgJob> page = PageConverter.toMybatis(req, OrgJob.class); IPage<OrgJob> page = PageConverter.toMybatis(req, OrgJob.class);
QueryWrapper<OrgJob> wrapper = QueryWrapperHelper.fromBean(req, OrgJob.class); QueryWrapper<OrgJob> wrapper = QueryWrapperHelper.fromBean(req, OrgJob.class);
if (wrapper.isEmptyOfWhere()) { if (wrapper.isEmptyOfWhere()) {
return PageResp.<OrgJob>builder().build(); return PageResp.<JobResp>builder().build();
} }
IPage<OrgJob> results = orgJobDao.page(page, wrapper) IPage<OrgJob> results = orgJobDao.page(page, wrapper)
.convert(e -> BeanUtil.toBean(e, OrgJob.class)); .convert(e -> BeanUtil.toBean(e, OrgJob.class));
PageResp<OrgJob> resp = PageConverter.toResp(results); PageResp<JobResp> resp = PageConverter.toResp(results);
List<OrgJob> records = resp.getData(); List<JobResp> records = resp.getData();
if (CollUtil.isEmpty(records)) { if (CollUtil.isEmpty(records)) {
return resp; return resp;
} }

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java
View File

@ -83,7 +83,7 @@ public class NodeServiceImpl implements NodeService {
// 获取岗位信息 // 获取岗位信息
if (CollUtil.isNotEmpty(req.getJobCodes())) { if (CollUtil.isNotEmpty(req.getJobCodes())) {
List<OrgJob> orgJobs = orgJobQueryRepository.list(OrgJobQueryRepository.ListReq.builder() List<OrgJobQueryRepository.JobResp> orgJobs = orgJobQueryRepository.list(OrgJobQueryRepository.ListReq.builder()
.ids(CollUtil.map(nodeUsers, OrganizationalNodeUser::getOrganizationalJobId, true)) .ids(CollUtil.map(nodeUsers, OrganizationalNodeUser::getOrganizationalJobId, true))
.codes(req.getJobCodes()) .codes(req.getJobCodes())
.build()); .build());

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java
View File

@ -33,5 +33,5 @@ public interface NodeUserFoundationService {
* @param nodeUsers * @param nodeUsers
* @param orgJobs * @param orgJobs
*/ */
<T extends OrganizationalNodeUser> void filterByJobs(List<T> nodeUsers, List<OrgJob> orgJobs); <T extends OrganizationalNodeUser, Job extends OrgJob> void filterByJobs(List<T> nodeUsers, List<Job> orgJobs);
} }

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java
View File

@ -135,7 +135,7 @@ public class NodeUserFoundationServiceImpl implements NodeUserFoundationService
} }
@Override @Override
public <T extends OrganizationalNodeUser> void filterByJobs(List<T> nodeUsers, List<OrgJob> orgJobs) { public <T extends OrganizationalNodeUser, Job extends OrgJob> void filterByJobs(List<T> nodeUsers, List<Job> orgJobs) {
List<Long> jobIds = CollUtil.map(orgJobs, OrgJob::getId, true); List<Long> jobIds = CollUtil.map(orgJobs, OrgJob::getId, true);
nodeUsers.removeIf(e -> !jobIds.contains(e.getOrganizationalJobId())); nodeUsers.removeIf(e -> !jobIds.contains(e.getOrganizationalJobId()));
} }

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java
View File

@ -40,7 +40,7 @@ public class OrgJobFoundationServiceImpl implements OrgJobFoundationService {
@Override @Override
public PageResp<OrgJobDTO> page(ListOrgJobReq req) { public PageResp<OrgJobDTO> page(ListOrgJobReq req) {
PageResp<OrgJob> page = orgJobQueryRepository.page(BeanUtil.copyProperties(req, OrgJobQueryRepository.ListReq.class)); PageResp<OrgJobQueryRepository.JobResp> page = orgJobQueryRepository.page(BeanUtil.copyProperties(req, OrgJobQueryRepository.ListReq.class));
return PageResp.<OrgJobDTO>builder() return PageResp.<OrgJobDTO>builder()
.size(page.getSize()) .size(page.getSize())
.current(page.getCurrent()) .current(page.getCurrent())