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

add(feature/REQ-3714) 判空

Browse Source
This commit is contained in:
zhangran 2025-03-12 15:44:11 +08:00
parent 796108914b
commit 25e1513168
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,9 @@ import cn.axzo.orgmanax.infra.client.tyr.SaasRoleUserClient;
import cn.axzo.orgmanax.infra.client.tyr.dto.OrgManaxWorkerManagerRoleUserReq; import cn.axzo.orgmanax.infra.client.tyr.dto.OrgManaxWorkerManagerRoleUserReq;
import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip; import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipQueryRepository; import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipQueryRepository;
import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalTeamOuRelation; import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalTeamOuRelation;
import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
import cn.axzo.orgmanax.infra.dao.node.repository.TeamOuRelationRepository; import cn.axzo.orgmanax.infra.dao.node.repository.TeamOuRelationRepository;
import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository; import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository;
import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository; import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository;
@ -78,6 +80,7 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor {
private final SaasRoleUserClient saasRoleUserClient; private final SaasRoleUserClient saasRoleUserClient;
private final EventProduceTemplate eventProduceTemplate; private final EventProduceTemplate eventProduceTemplate;
private final RocketConfigProperties rocketConfigProperties; private final RocketConfigProperties rocketConfigProperties;
private final NodeQueryRepository nodeQueryRepository;
private static final String PROMISE_GROUP_EVENT_MODULE = "promise-group"; private static final String PROMISE_GROUP_EVENT_MODULE = "promise-group";
private static final String PROMISE_GROUP_EVENT_NAME = "promise-group-remove"; private static final String PROMISE_GROUP_EVENT_NAME = "promise-group-remove";
@ -155,6 +158,7 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor {
private void removePlatTeamManager(OrganizationalTeamOuRelation ouRelation, List<NodeUserDTO> nodeUserDTOS) { private void removePlatTeamManager(OrganizationalTeamOuRelation ouRelation, List<NodeUserDTO> nodeUserDTOS) {
//若该工人是班组管理员，则一并移除平台管理员、项目级权限等。 //若该工人是班组管理员，则一并移除平台管理员、项目级权限等。
SaasCooperateShip saasCooperateShip = getSaasCooperateShip(ouRelation.getNodeId()); SaasCooperateShip saasCooperateShip = getSaasCooperateShip(ouRelation.getNodeId());
AssertUtil.isFalse(Objects.isNull(saasCooperateShip), "获取班组协同关系失败");
// 获取岗位 // 获取岗位
List<OrgJobQueryRepository.JobResp> jobs = getJob(Sets.newHashSet(entManagerCode, entWorkerCode)); List<OrgJobQueryRepository.JobResp> jobs = getJob(Sets.newHashSet(entManagerCode, entWorkerCode));
Optional<OrgJobQueryRepository.JobResp> entWorkerJob = jobs.stream().filter(item -> Objects.equals(item.getCode(), entWorkerCode)).findFirst(); Optional<OrgJobQueryRepository.JobResp> entWorkerJob = jobs.stream().filter(item -> Objects.equals(item.getCode(), entWorkerCode)).findFirst();
@ -187,11 +191,23 @@ public class DeletePlatTeamWorkerProcessor implements NodeUserProcessor {
); );
} }
private SaasCooperateShip getSaasCooperateShip(Long nodeId) { private SaasCooperateShip getSaasCooperateShip(Long ouRelationNodeId) {
CooperateShipQueryRepository.OneReq build = CooperateShipQueryRepository.OneReq.builder() NodeQueryRepository.ListReq nodeQuery = NodeQueryRepository.ListReq.builder()
.organizationalNodeId(nodeId) .ids(Lists.newArrayList(ouRelationNodeId))
.build(); .build();
return cooperateShipQueryRepository.one(build); List<OrganizationalNode> organizationalNodes = nodeQueryRepository.list(nodeQuery);
if (Objects.isNull(organizationalNodes)){
return null;
}
OrganizationalNode organizationalNode = organizationalNodes.get(0);
CooperateShipQueryRepository.ListReq build = CooperateShipQueryRepository.ListReq.builder()
.organizationNodeIds(Lists.newArrayList(organizationalNode.getTopNodeId()))
.build();
List<SaasCooperateShip> saasCooperateShips = cooperateShipQueryRepository.list(build);
if(CollUtil.isEmpty(saasCooperateShips)){
return null;
}
return saasCooperateShips.get(0);
} }
private void updateWorkerNodeJob(OrgJobQueryRepository.JobResp jobResp, List<NodeUserDTO> nodeUserDTOS) { private void updateWorkerNodeJob(OrgJobQueryRepository.JobResp jobResp, List<NodeUserDTO> nodeUserDTOS) {