From 0f98f8d5135a0a3ee02f2af915d2e8c0ae37dec9 Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Mon, 23 Dec 2024 18:05:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3282):=20=E5=8D=95=E4=BD=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=A0=E4=B8=8A=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java | 4 ++++ .../infra/dao/unit/repository/UnitQueryRepository.java | 4 ++++ .../axzo/orgmanax/server/unit/controller/UnitController.java | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java index 7b38a48..2d77e49 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java @@ -42,6 +42,10 @@ public class ListUnitReq extends PageReqV2 { private String uniformSocialCreditCode; @CriteriaField private Integer entTag; + @CriteriaField(field = "type", operator = Operator.IN) + private Set types; + @CriteriaField(field = "tempSourceId", operator = Operator.IN) + private Set sourceIds; @CriteriaField(ignore = true) Integer page; @CriteriaField(ignore = true) diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java index 92188fd..b10a56c 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/repository/UnitQueryRepository.java @@ -100,6 +100,10 @@ public interface UnitQueryRepository { private String uniformSocialCreditCode; @CriteriaField private Integer entTag; + @CriteriaField(field = "type", operator = Operator.IN) + private Set types; + @CriteriaField(field = "tempSourceId", operator = Operator.IN) + private Set sourceIds; } @EqualsAndHashCode(callSuper = true) diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitController.java index d93e1bf..aa87f10 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitController.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitController.java @@ -40,7 +40,6 @@ public class UnitController implements OrgUnitApi { @Override public ApiResult> list(ListUnitReq req) { - return ApiResult.success(unitService.list(req)); } }