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

liu

2026-10-26 dddc473c582e983674913163dd4e93f840effbdb

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java

@@ -32,6 +32,7 @@
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -114,6 +115,17 @@
                        .setCustomerId(contact.getCustomerId())));
    }

    @GetMapping("/list-by-customer")
    @Operation(summary = "获得联系人列表，基于指定客户")
    @Parameter(name = "customerId", description = "客户编号", required = true)
    @PreAuthorize("@ss.hasPermission('crm:contact:query')")
    public CommonResult<List<CrmContactRespVO>> getContactListByCustomer(@RequestParam("customerId") Long customerId) {
        List<CrmContactDO> list = contactService.getContactListByCustomerId(customerId);
        return success(convertList(list, contact -> // 只返回 id、name 字段
                new CrmContactRespVO().setId(contact.getId()).setName(contact.getName())
                        .setCustomerId(contact.getCustomerId())));
    }

    @GetMapping("/page")
    @Operation(summary = "获得联系人分页")
    @PreAuthorize("@ss.hasPermission('crm:contact:query')")
@@ -149,6 +161,27 @@
        ExcelUtils.write(response, "联系人.xls", "数据", CrmContactRespVO.class, buildContactDetailList(list));
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得导入联系人模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<CrmContactImportExcelVO> list = Arrays.asList(
                CrmContactImportExcelVO.builder().name("示例联系人").customerName("示例客户")
                        .mobile("13800138000").telephone("").email("").wechat("").post("").remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "联系人导入模板.xls", "联系人列表", CrmContactImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入联系人")
    @PreAuthorize("@ss.hasPermission('crm:contact:import')")
    public CommonResult<CrmContactImportRespVO> importExcel(@Valid CrmContactImportReqVO importReqVO)
            throws Exception {
        List<CrmContactImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), CrmContactImportExcelVO.class);
        return success(contactService.importContactList(list, importReqVO));
    }

    private List<CrmContactRespVO> buildContactDetailList(List<CrmContactDO> contactList) {
        if (CollUtil.isEmpty(contactList)) {
            return Collections.emptyList();