From a862c36323b8c6b47f8c41f3860ac93411348c4c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 13 十月 2026 17:56:18 +0800
Subject: [PATCH] Merge branch 'dev_海西州_惠牧' into dev_海西州_惠牧2
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
index 34388df..5438515 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
@@ -200,7 +200,7 @@
}
list = CollectionUtils.filterList(list, customer -> {
// 鐗规畩锛氬鏋滄病璐熻矗浜猴紝鍒欒鏄庡凡缁忓湪鍏捣锛屼笉鐢ㄨ绠�
- if (customer.getOwnerUserId() == null) {
+ if (customer.getOwnerUserId() == null || Boolean.FALSE.equals(customer.getAutoPoolEnabled())) {
return false;
}
// 宸叉垚浜� or 宸查攣瀹氾紝涓嶈繘鍏ュ叕娴�
@@ -249,12 +249,12 @@
public void importTemplate(HttpServletResponse response) throws IOException {
// 鎵嬪姩鍒涘缓瀵煎嚭 demo
List<CrmCustomerImportExcelVO> list = Arrays.asList(
- CrmCustomerImportExcelVO.builder().name("鑺嬮亾").industryId(1).level(1).source(1)
+ CrmCustomerImportExcelVO.builder().name("瓒呯骇绠＄悊鍛�").industryId(1).level(1).source(1)
.mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").build(),
+ .areaId(null).detailAddress("").remark("").autoPoolEnabled(true).build(),
CrmCustomerImportExcelVO.builder().name("婧愮爜").industryId(1).level(1).source(1)
.mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").build()
+ .areaId(null).detailAddress("").remark("").autoPoolEnabled(true).build()
);
// 杈撳嚭
ExcelUtils.write(response, "瀹㈡埛瀵煎叆妯℃澘.xls", "瀹㈡埛鍒楄〃", CrmCustomerImportExcelVO.class, list);
--
Gitblit v1.9.3