From 8b68e5a8d8d43bcb45c9032c3eb893a2b8995acf Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 四月 2026 16:18:51 +0800
Subject: [PATCH] fix(customer): 修复客户私海相关查询和导入功能

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e12b63c..4ae5508 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -25,6 +25,22 @@
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name  like  concat('%',#{c.productName},'%')
             </if>
+            <if test="c.topProductParentId != null and c.topProductParentId > 0">
+                and p.id in (
+                    WITH RECURSIVE product_tree AS (
+                        SELECT id
+                        FROM product
+                        WHERE id = #{c.topProductParentId}
+                        
+                        UNION ALL
+                        
+                        SELECT p.id
+                        FROM product p
+                        INNER JOIN product_tree pt ON p.parent_id = pt.id
+                    )
+                    select id from product_tree
+                )
+            </if>
         </where>
         order by  pm.id
     </select>
@@ -97,5 +113,14 @@
 
         ORDER BY pm.id DESC
     </select>
+    <select id="getProductAndModelList" resultType="java.util.Map">
+        select p.id as id,
+               pm.id as modelId,
+               p.product_name as productName ,
+               pm.model as  model
+        from product_model pm
+        left join product p on p.id = pm.product_id
+        order by p.id,pm.id desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3