From c240208edf43815a8e16134de892a9af91b74e51 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 22 Jan 2026 17:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=83=A8=E9=97=A8=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=8D=A2=E6=88=90=E5=A4=9A=E4=B8=AA=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/command/query/DepartmentQueryExe.java      |  2 +-
 .../zcloud/basic/info/dto/DepartmentTreeQry.java    |  2 +-
 .../basic/info/domain/enums/CorpTypeEnum.java       | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

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<DepartmentTreeInfoCO> listAllTreeByCorpType(DepartmentTreeQry qry) {
         Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) parmas.get("enterpriseType"));
+        List<Integer> 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<Integer> inType;
 
     @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType")
-    private Integer enterpriseType;
+    private List<Integer> 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<Integer> getCodesByEnterpriseType(Integer enterpriseType) {
         return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList());
     }
+    public static List<Integer> getCodesByEnterpriseType(List<Integer> 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)) {