From a4a34c89c4ef196619abc0783f328475d551a416 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 4 Mar 2025 17:42:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E7=94=A8=E5=8D=B0=E8=BF=9B=E5=B1=95=E4=B8=AD=E7=9A=84=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E5=8D=95=E4=BD=8D=E7=94=B3=E8=AF=B7=E7=94=A8=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeRecordRelationServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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) {