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

Merge branch 'feature/REQ-3714' into 'master'

Browse Source 
Feature/req 3714

See merge request universal/infrastructure/backend/orgmanax!277
This commit is contained in:
谭杰 2025-04-10 05:50:29 +00:00
commit 46d3d74f1c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserCheckServiceImpl.java
View File

@ -42,7 +42,17 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.ToIntFunction; import java.util.function.ToIntFunction;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -391,6 +401,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
.filter(nu -> Objects.equals(nu.getPersonId(), personId)) .filter(nu -> Objects.equals(nu.getPersonId(), personId))
.min(Comparator.comparingInt(NODE_USER_PRIORITY_RESOLVER)) .min(Comparator.comparingInt(NODE_USER_PRIORITY_RESOLVER))
.orElse(null)) .orElse(null))
.filter(Objects::nonNull)
.collect(Collectors.toList()); .collect(Collectors.toList());
log.info("## checkUserOperate, param = {}, operator = {}, targets = {}, nodeUsers = {} " log.info("## checkUserOperate, param = {}, operator = {}, targets = {}, nodeUsers = {} "

2
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/impl/DeletePlatTeamWorkerProcessor.java
View File

@ -171,7 +171,7 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor {
sendWorkerMessage(ouRelation, vs); sendWorkerMessage(ouRelation, vs);
return; return;
} }
log.error("获取企业下班组与平台班组关系失败, nodeId:{}", nodeId); log.warn("获取企业下班组与平台班组关系失败, nodeId:{}", nodeId);
}); });
} }