From 0898fb340bcd039150308b44cb2bc4437ce0bfaa Mon Sep 17 00:00:00 2001 From: zhangyue Date: Fri, 6 Mar 2026 18:48:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/basic/info/dto/CorpInfoQry.java | 2 ++ .../repository/impl/CorpInfoRepositoryImpl.java | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java index 94bd9e2f..49b53559 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java @@ -66,6 +66,8 @@ public class CorpInfoQry { @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true) private Integer enterpriseType; + @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseTypeList", required = true) + private List enterpriseTypeList; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) private String eqCode; 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 28d3edf8..e319e0c2 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 @@ -136,6 +136,16 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl enterpriseTypeList = (List) params.get("enterpriseTypeList"); + if (enterpriseTypeList != null && enterpriseTypeList.size() > 0){ + List entTypeList = CorpTypeEnum.getCodesByEnterpriseType(enterpriseTypeList); + if (CollUtil.isNotEmpty(entTypeList)) { + queryWrapper.in("type", entTypeList); + } + } + } queryWrapper.orderByAsc("corp_order").orderByDesc("create_time"); return corpInfoMapper.selectList(queryWrapper); } From cce85ba1ee25925a859c548af36c917518ba1ef0 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Mon, 9 Mar 2026 11:37:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=20rz=5Fflag=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=B0=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-infrastructure/src/main/resources/mapper/UserMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 301ae437..c3a1d0ed 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -311,6 +311,7 @@ u.political_affiliation_name, u.employment_flag, u.flow_flag, + u.rz_flag, CASE WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN @@ -389,6 +390,7 @@ u.political_affiliation_name, u.employment_flag, u.flow_flag, + u.rz_flag, CASE WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN