From 47ebd5c6d7fe337293cd0f14bf11e216d9bacb38 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 17 Aug 2026 14:46:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(department):=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=A0=91=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=B9=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E8=B4=A8=E9=A1=B5=E9=9D=A2=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/sdk-prod.yml | 7 ++++++- start/src/main/resources/sdk-prod2.yml | 8 +++++++- .../basic/info/web/DepartmentController.java | 2 +- .../info/command/query/DepartmentQueryExe.java | 17 ++++++++++++++--- .../domain/config/QualificationsPageConfig.java | 16 ++++++++++++++++ 5 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 web-domain/src/main/java/com/zcloud/basic/info/domain/config/QualificationsPageConfig.java diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml index 58279645..2068da3a 100644 --- a/start/src/main/resources/sdk-prod.yml +++ b/start/src/main/resources/sdk-prod.yml @@ -70,4 +70,9 @@ nine: companyId: 2008712261453131776,2046785341004177408 file: upload: - url: https://jpfz.qhdsafety.com/gbsFileTest/ \ No newline at end of file + url: https://jpfz.qhdsafety.com/gbsFileTest/ +qualifications: + page: + allowed-tenant-ids: + - 1976974388809424896 + - 2008712261453131776 \ No newline at end of file diff --git a/start/src/main/resources/sdk-prod2.yml b/start/src/main/resources/sdk-prod2.yml index d4bf879b..84a63e4c 100644 --- a/start/src/main/resources/sdk-prod2.yml +++ b/start/src/main/resources/sdk-prod2.yml @@ -69,4 +69,10 @@ nine: companyId: 2590800828822460065,2044322367672422400 file: upload: - url: http://192.168.192.201:8992/file/uploadFiles2/ \ No newline at end of file + url: http://192.168.192.201:8992/file/uploadFiles2/ +qualifications: + page: + allowed-tenant-ids: + - 1746864895590143510 + - 2076831356482732032 + - 1976974388809424896 \ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 4342070d..f0c5f999 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -104,7 +104,7 @@ public class DepartmentController { return MultiResponse.of(departmentService.listAllTreeByCorpType(qry)); } - @ApiOperation("所有企业下部门树状所有数据根据企业类型和企业id集合") + @ApiOperation("所有企业下部门树状所有数据根据企业类型和企业id集合-其他地方不要用，只有资质申请那块用") @PostMapping("/listAllTreeByCorpTypeAndCorpIds") public MultiResponse listAllTreeByCorpTypeAndCorpIds(@RequestBody DepartmentTreeCorpQry qry) { return MultiResponse.of(departmentService.listAllTreeByCorpTypeAndCorpIds(qry)); 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 c212184c..70161e9a 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.alibaba.cola.exception.BizException; 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.config.QualificationsPageConfig; import com.zcloud.basic.info.domain.enums.CommonFlagEnum; import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.dto.*; @@ -42,6 +43,7 @@ public class DepartmentQueryExe { private final DepartmentSuperviseRepository departmentSuperviseRepository; private final UserRepository userRepository; private final CorpInfoRepository corpInfoRepository; + private final QualificationsPageConfig qualificationsPageConfig; @DubboReference private ZcloudDepartmentFacade zcloudDepartmentFacade; @@ -208,17 +210,26 @@ public class DepartmentQueryExe { if (CollUtil.isNotEmpty(enterpriseType)) { params.put("inType", enterpriseType); } - if (CollUtil.isNotEmpty(qry.getCorpinfoIdList())) { + params.remove("corpinfoIdList"); + List corpinfoIdList = new ArrayList<>(); + if (CollUtil.isEmpty(qry.getInType())) { + if (CollUtil.isEmpty(qualificationsPageConfig.getAllowedTenantIds())) { + return Collections.emptyList(); + } + corpinfoIdList.addAll(qualificationsPageConfig.getAllowedTenantIds()); + } else if (CollUtil.isNotEmpty(qry.getCorpinfoIdList())) { try { - List corpinfoIdList = qry.getCorpinfoIdList().stream() + corpinfoIdList = qry.getCorpinfoIdList().stream() .map(StringUtils::trim) .map(Long::valueOf) .collect(Collectors.toList()); - params.put("corpinfoIdList", corpinfoIdList); } catch (NumberFormatException e) { throw new BizException("企业id格式错误"); } } + if (CollUtil.isNotEmpty(corpinfoIdList)) { + params.put("corpinfoIdList", corpinfoIdList); + } List pageResponse = departmentRepository.listAllTreeByCorpTypeAndCorpIds(params); if (CollUtil.isEmpty(pageResponse)) { return Collections.emptyList(); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/config/QualificationsPageConfig.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/config/QualificationsPageConfig.java new file mode 100644 index 00000000..5e6f3896 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/config/QualificationsPageConfig.java @@ -0,0 +1,16 @@ +package com.zcloud.basic.info.domain.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +@Component +@ConfigurationProperties(prefix = "qualifications.page") +@Data +public class QualificationsPageConfig { + + private List allowedTenantIds = new ArrayList<>(); +}