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-03-13 18:09:05 +08:00
parent 15648e026f
commit ad22076462
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/BatchDeleteNodeUserCheckReq.java
View File

@ -3,7 +3,6 @@ package cn.axzo.orgmanax.dto.nodeuser.req;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Set;
/**
@ -33,4 +32,15 @@ public class BatchDeleteNodeUserCheckReq {
* 操作者ID
*/
private Long operatorId;
}
/**
* 登录单位
*/
private Long loginOuId;
/**
* 单位类型
*/
private Integer ouType;
}

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

@ -114,7 +114,6 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
ListOrgCooperateShipReq listOrgCooperateShipReq = new ListOrgCooperateShipReq();
listOrgCooperateShipReq.setOuIds(Collections.singleton(ouId));
listOrgCooperateShipReq.setStatuses(CollUtil.newHashSet(0, 1));
listOrgCooperateShipReq.setWorkspaceTypes(CollUtil.newHashSet(2));
List<OrgCooperateShipDTO> listPersonJoinedWorkspace = cooperateShipService.list(listOrgCooperateShipReq);
Set<Long> inProjectPersonIds = filterByPerson(listPersonJoinedWorkspace, personIds);
@ -191,8 +190,6 @@ public class NodeUserCheckServiceImpl implements NodeUserCheckService {
ListOrgCooperateShipReq listOrgCooperateShipReq = new ListOrgCooperateShipReq();
listOrgCooperateShipReq.setOuIds(Collections.singleton(req.getOuId()));
listOrgCooperateShipReq.setWorkspaceIds(Collections.singleton(req.getWorkspaceId()));
listOrgCooperateShipReq.setStatuses(CollUtil.newHashSet(0, 1));
listOrgCooperateShipReq.setIncludeChildren(true);
List<OrgCooperateShipDTO> cooperateShipRespList = cooperateShipService.list(listOrgCooperateShipReq);
Axssert.checkNotEmpty(cooperateShipRespList, "操作失败，获取协同组织失败");