feat(department): 优化部门树查询接口并添加资质页面租户配置

start/src/main/resources/sdk-prod.yml

@@ -70,4 +70,9 @@ nine:
     companyId: 2008712261453131776,2046785341004177408
 file:
   upload:
-    url: https://jpfz.qhdsafety.com/gbsFileTest/
+    url: https://jpfz.qhdsafety.com/gbsFileTest/
+qualifications:
+  page:
+    allowed-tenant-ids:
+      - 1976974388809424896
+      - 2008712261453131776

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/
+    url: http://192.168.192.201:8992/file/uploadFiles2/
+qualifications:
+  page:
+    allowed-tenant-ids:
+      - 1746864895590143510
+      - 2076831356482732032
+      - 1976974388809424896

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<DepartmentTreeInfoCO> listAllTreeByCorpTypeAndCorpIds(@RequestBody DepartmentTreeCorpQry qry) {
         return MultiResponse.of(departmentService.listAllTreeByCorpTypeAndCorpIds(qry));

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<Long> 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<Long> 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<DepartmentDO> pageResponse = departmentRepository.listAllTreeByCorpTypeAndCorpIds(params);
         if (CollUtil.isEmpty(pageResponse)) {
             return Collections.emptyList();

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<Long> allowedTenantIds = new ArrayList<>();
+}