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)); } }