diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 9df05228..cbf1a29a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -189,7 +189,7 @@ public class DepartmentQueryExe { public Collection listAllTreeByCorpType(DepartmentTreeQry qry) { Map parmas = PageQueryHelper.toHashMap(qry); - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) parmas.get("enterpriseType")); + List enterpriseType =CorpTypeEnum.getCodesByEnterpriseType(qry.getEnterpriseType()); if (CollUtil.isNotEmpty(enterpriseType)) { parmas.put("inType",enterpriseType); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java index a0a2ade1..dd12b62a 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java @@ -35,7 +35,7 @@ public class DepartmentTreeQry { private List inType; @ApiModelProperty(value = "企业类型1:监管 2:企业 3:相关方", name = "enterpriseType") - private Integer enterpriseType; + private List enterpriseType; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java index 12105e53..9c69fa80 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.domain.enums; +import cn.hutool.core.collection.CollUtil; import lombok.Getter; import java.util.*; @@ -46,6 +47,18 @@ public enum CorpTypeEnum { public static List getCodesByEnterpriseType(Integer enterpriseType) { return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()); } + public static List getCodesByEnterpriseType(List enterpriseTypeList) { + if(CollUtil.isEmpty(enterpriseTypeList)){ + return null; + } + return enterpriseTypeList.stream() + .flatMap(enterpriseType -> + ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()).stream()) + .distinct() + .collect(Collectors.toList()); + + } + public static Integer getUserTypeByCode(Integer code) { for (CorpTypeEnum corpType : values()) { if (corpType.code.equals(code)) {