From ca23602089d4a5410fa5fe125b317c260536c192 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 18 七月 2026 11:42:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

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

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 6270b1d..b485059 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -16,6 +16,7 @@
 
     <resultMap id="ProductModelVoResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
         <result column="create_time" property="createTime" />
+        <result column="top_product_name" property="topProductName" />
         <collection property="batchNoList"
                     ofType="java.lang.String"
                     column="{productModelId=id}"
@@ -23,9 +24,20 @@
     </resultMap>
 
     <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
-        select pm.*,p.product_name
+        WITH RECURSIVE product_root AS (
+            SELECT id, parent_id, product_name
+            FROM product
+            WHERE parent_id IS NULL
+            UNION ALL
+            SELECT p.id, p.parent_id, pr.product_name
+            FROM product p
+            INNER JOIN product_root pr ON p.parent_id = pr.id
+        )
+        select pm.*, p.product_name,
+               pr.product_name as top_product_name
         from product_model pm
         left join product p on pm.product_id = p.id
+        left join product_root pr on p.id = pr.id
         <where>
             <if test="c.model != null and c.model != ''">
                 and pm.model  like  concat('%',#{c.model},'%')

--
Gitblit v1.9.3