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

feat:[REQ-3488] 过滤入参中集合类型中可能有null值的元素

Browse Source
This commit is contained in:
liuyang 2025-01-13 16:01:14 +08:00
parent 7a22e944c4
commit 9720d8d8b0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/executor/ListNodeCmdExe.java
View File

@ -110,14 +110,14 @@ public class ListNodeCmdExe {
NodeQueryRepository.ListReq listReq = reqListBuilder
.page(req.getPage())
.pageSize(req.getPageSize())
.ids(req.getIds())
.parentIds(req.getParentIds())
.ouIds(req.getOuIds())
.topNodeIds(req.getTopNodeIds())
.ids(filterNullValues(req.getIds()))
.parentIds(filterNullValues(req.getParentIds()))
.ouIds(filterNullValues(req.getOuIds()))
.topNodeIds(filterNullValues(req.getTopNodeIds()))
.nodeName(req.getNodeName())
.nodeNames(req.getNodeNames())
.includeOrgNodeTypes(req.getIncludeOrgNodeTypes())
.excludeOrgNodeTypes(req.getExcludeOrgNodeTypes())
.nodeNames(filterNullValues(req.getNodeNames()))
.includeOrgNodeTypes(filterNullValues(req.getIncludeOrgNodeTypes()))
.excludeOrgNodeTypes(filterNullValues(req.getExcludeOrgNodeTypes()))
.includeDelete(req.getIncludeDelete())
.isSelectTopNodeOnly(req.getIsSelectTopNodeOnly()).build();
@ -275,7 +275,7 @@ public class ListNodeCmdExe {
* @return
* @param <T>
*/
private <T> Collection<T> filterNullValues(Collection<T> collection) {
private <C extends Collection<T>, T> C filterNullValues(C collection) {
if (CollUtil.isEmpty(collection)) {
return collection;
}