From 15805b0707c52319e134c665422482da4bfc5ed1 Mon Sep 17 00:00:00 2001 From: songyuanlun Date: Fri, 8 Nov 2024 15:37:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3136):=20=E6=9F=A5=E8=AF=A2=E6=B3=B0?= =?UTF-8?q?=E5=B7=9E=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?personid=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/riven/client/req/ListThirdProjectPeopleReq.java | 5 +++++ .../riven/third/controller/ThirdPartPersonController.java | 1 + 2 files changed, 6 insertions(+) diff --git a/riven-api/src/main/java/cn/axzo/riven/client/req/ListThirdProjectPeopleReq.java b/riven-api/src/main/java/cn/axzo/riven/client/req/ListThirdProjectPeopleReq.java index 8951831..17f10c6 100644 --- a/riven-api/src/main/java/cn/axzo/riven/client/req/ListThirdProjectPeopleReq.java +++ b/riven-api/src/main/java/cn/axzo/riven/client/req/ListThirdProjectPeopleReq.java @@ -30,5 +30,10 @@ public class ListThirdProjectPeopleReq implements Serializable { */ private Set thirdUniquePersonIds; + /** + * 人员id集合 + */ + private Set personIds; + private Boolean needThirdPerson; } diff --git a/riven-third/src/main/java/cn/axzo/riven/third/controller/ThirdPartPersonController.java b/riven-third/src/main/java/cn/axzo/riven/third/controller/ThirdPartPersonController.java index 4cdff4c..31f9452 100644 --- a/riven-third/src/main/java/cn/axzo/riven/third/controller/ThirdPartPersonController.java +++ b/riven-third/src/main/java/cn/axzo/riven/third/controller/ThirdPartPersonController.java @@ -92,6 +92,7 @@ public class ThirdPartPersonController implements ThirdPartPersonApi { Map thirdPersonMap = thirdPersonDao.lambdaQuery() .eq(ThirdPerson::getThirdCode, param.getThirdCode()) .in(ThirdPerson::getThirdUniquePersonId, thirdPersonIds) + .in(CollUtil.isNotEmpty(param.getPersonIds()), ThirdPerson::getPersonId, param.getPersonIds()) .eq(ThirdPerson::getIsDelete, TableIsDeleteEnum.NORMAL.value) .list().stream() .collect(Collectors.toMap(ThirdPerson::getThirdUniquePersonId, Function.identity()));