fix(search): 修复多处搜索条件未生效的问题

liu

2026-10-26 dddc473c582e983674913163dd4e93f840effbdb

 yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiDataSourceConfigController.java

@@ -2,16 +2,25 @@

import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiDataSourceConfigImportExcelVO;
import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiDataSourceConfigImportReqVO;
import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiDataSourceConfigImportRespVO;
import cn.iocoder.yudao.module.bi.dal.dataobject.BiDataSourceConfigDO;
import cn.iocoder.yudao.module.bi.service.config.BiDataSourceConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;

import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

@@ -60,9 +69,32 @@
    @Operation(summary = "分页查询数据源配置")
    @PreAuthorize("@ss.hasPermission('bi:data-source-config:query')")
    public CommonResult<PageResult<BiDataSourceConfigDO>> getPage(
            @RequestParam(value = "name", required = false) String name,
            @RequestParam(value = "type", required = false) String type,
            @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
        return success(dataSourceConfigService.getPage(pageNo, pageSize));
        return success(dataSourceConfigService.getPage(name, type, pageNo, pageSize));
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得导入数据源配置模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<BiDataSourceConfigImportExcelVO> list = Arrays.asList(
                BiDataSourceConfigImportExcelVO.builder().name("示例数据源").type("mysql")
                        .config("{}").status(1).build()
        );
        // 输出
        ExcelUtils.write(response, "数据源配置导入模板.xls", "数据源配置列表", BiDataSourceConfigImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入数据源配置")
    @PreAuthorize("@ss.hasPermission('bi:data-source-config:import')")
    public CommonResult<BiDataSourceConfigImportRespVO> importExcel(@Valid BiDataSourceConfigImportReqVO importReqVO)
            throws Exception {
        List<BiDataSourceConfigImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), BiDataSourceConfigImportExcelVO.class);
        return success(dataSourceConfigService.importDataSourceConfigList(list, importReqVO));
    }

}