zcloud_gbs
/
zcloud_gbs_basic_info_gwj
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

main
zhaokai 2026-03-10 20:06:56 +08:00
parent ae4efc8e73 cce85ba1ee
commit e37a2d5c16
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java
View File

@ -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<Integer> enterpriseTypeList;
@ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
private String eqCode;

10
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
View File

@ -136,6 +136,16 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
if (CollUtil.isNotEmpty(enterpriseType)) {
queryWrapper.in("type", enterpriseType);
}
if (params.get("enterpriseTypeList") != null
&& params.get("enterpriseTypeList") instanceof List){
List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");
if (enterpriseTypeList != null && enterpriseTypeList.size() > 0){
List<Integer> entTypeList = CorpTypeEnum.getCodesByEnterpriseType(enterpriseTypeList);
if (CollUtil.isNotEmpty(entTypeList)) {
queryWrapper.in("type", entTypeList);
}
}
}
queryWrapper.orderByAsc("corp_order").orderByDesc("create_time");
return corpInfoMapper.selectList(queryWrapper);
}

2
web-infrastructure/src/main/resources/mapper/UserMapper.xml
View File

@ -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