diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index 3ca11888..5e7fe30d 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -98,6 +98,8 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; +import static cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum.PROJ_GROUP; +import static cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum.PROJ_TEAM; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_ATTACH; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_ID; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_TYPE; @@ -616,10 +618,12 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl listCooperateShipTypes(VisaRequestStampReq req, ChangeRecord visa) { - return visaCooperateShipGateway.genericQuery(CooperateShipQueryReq.builder() + List cooperateShipResps = visaCooperateShipGateway.genericQuery(CooperateShipQueryReq.builder() .workspaceId(visa.getRelationWorkspaceId()) + .excludeCooperateTypes(Lists.newArrayList(PROJ_TEAM.getCode(), PROJ_GROUP.getCode())) .ouIdList(req.getRequestStamps().stream().map(VisaRequestStampReq.RequestStampModel::getOuId).distinct().collect(Collectors.toList())) - .build()).stream().collect(Collectors.toMap(CooperateShipResp::getOrganizationalUnitId, i -> SaasCooperateShipCooperateTypeEnum.getByCode(i.getCooperateType()).name())); + .build()); + return cooperateShipResps.stream().collect(Collectors.toMap(CooperateShipResp::getOrganizationalUnitId, i -> SaasCooperateShipCooperateTypeEnum.getByCode(i.getCooperateType()).name())); } private Map createContract(VisaRequestStampReq req, ChangeRecord visa) {