From 78859de3fc0d1feca9c4ffcd8466240690e8a429 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 9 Jan 2026 16:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BC=81=E4=B8=9A=E4=B8=8B?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91=E7=8A=B6=E6=89=80=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A0=B9=E6=8D=AE=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/command/query/DepartmentQueryExe.java | 6 +++++- .../java/com/zcloud/basic/info/dto/DepartmentTreeQry.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 73596c49..9024468e 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor; import com.zcloud.basic.info.domain.enums.CommonFlagEnum; +import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.*; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; @@ -188,7 +189,10 @@ public class DepartmentQueryExe { public Collection listAllTreeByCorpType(DepartmentTreeQry qry) { Map parmas = PageQueryHelper.toHashMap(qry); - + List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) parmas.get("enterpriseType")); + if (CollUtil.isNotEmpty(enterpriseType)) { + parmas.put("corpinfoTypeList",enterpriseType); + } List pageResponse = departmentRepository.listAllTreeByCorpType(parmas); if (CollUtil.isEmpty(pageResponse)) { return Collections.emptyList(); 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 7e34cb74..530726f0 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 @@ -34,6 +34,9 @@ public class DepartmentTreeQry { @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "corpinfoTypeList") private List corpinfoTypeList; + @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType") + private Integer enterpriseType; + }