From b59dc8bc82e7aa1e8a00c1619b7dc2a49231cf2d Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 8 Jun 2026 18:01:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(corp):=20=E6=B7=BB=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java | 4 +++- .../persistence/repository/impl/CorpInfoRepositoryImpl.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java index 2abbb017..73b3940d 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; +import java.util.List; /** @@ -38,11 +39,12 @@ public class CorpUserMiddleQry extends PageQuery { private Integer eqUseFlag; @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true) - @NotNull(message = "企业类型不能为空") private Integer enterpriseType; @ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType") private String eqType; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位, 6-物资中心)", name = "inType") + private List inType; @ApiModelProperty(value = "选取形式", name = "selectFrom") private String selectFrom; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index edf896e2..20ef28cc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -266,6 +266,10 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl inType = (List) params.get("inType"); + if (CollUtil.isNotEmpty(inType)) { + params.put("type", inType); + } String menuPerms = ""; if (!ObjectUtils.isEmpty(params.get("menuPath"))) { menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());