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/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml b/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
index dc10f12..662e369 100644
--- a/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
+++ b/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
@@ -249,7 +249,7 @@
FROM crm_customer AS customer
LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
LEFT JOIN crm_contract_product AS contract_product ON contract_product.contract_id = contract.id
- LEFT JOIN crm_product AS product ON contract_product.product_id = product.id
+ LEFT JOIN mdm_item AS product ON contract_product.item_id = product.id
WHERE customer.deleted = 0
AND contract.deleted = 0
AND contract_product.deleted = 0
@@ -260,7 +260,7 @@
#{userId}
</foreach>
AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
- GROUP BY product.id
+ GROUP BY product.id, product.name
</select>
</mapper>
--
Gitblit v1.9.3