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

feat(REQ-3714): 把删除的人过滤掉

Browse Source
This commit is contained in:
zhanghonghao 2025-04-09 20:01:48 +08:00
parent 3ef0b06d61
commit 27b4fc2699
1 changed files with 13 additions and 3 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/nodeuser/service/impl/NodeUserCheckServiceImpl.java
View File

@ -39,11 +39,20 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Value;
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.stream.Collectors;
@ -392,6 +401,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
.filter(nu -> Objects.equals(nu.getPersonId(), personId))
.min(Comparator.comparingInt(NODE_USER_PRIORITY_RESOLVER))
.orElse(null))
.filter(Objects::nonNull)
.collect(Collectors.toList());
log.info("## checkUserOperate, param = {}, operator = {}, targets = {}, nodeUsers = {} "
@ -407,7 +417,7 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
}
throw ResultCode.INVALID_PARAMS.toException("你已经被移出该企业/项目，请及时联系管理员；你可以退出登录或切换到其他企业/项目使用");
}
if (ObjectUtils.anyNull(targets)) {
if (CollUtil.isEmpty(targets)) {
throw ResultCode.INVALID_PARAMS.toException("操作对象已经被移出该企业/项目，请刷新页面重新操作");
}