From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
index da973e9..fafc06e 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -4,20 +4,35 @@
 <mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.TyProductModelDao">
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.TyProductModel">
-        select a.*
-        from product_model_common a
-        where a.is_delete = 0
-        and a.pid in (select src_id from product_model where id = ${pid})
-        and ((a.node_type = 1) or (a.node_type &lt;&gt; 1 and id not in (select src_id from product_model where pid = ${pid})))
-        <if test="orderBySql!=null">
-            ORDER BY ${orderBySql}
-        </if>
+        SELECT a.*
+        FROM product_model_common a
+                 JOIN (SELECT product_type, src_id
+                       FROM product_model
+                       WHERE id = ${pid} AND is_delete = 0) AS b
+        WHERE a.is_delete = 0
+          AND (
+                    b.product_type = 3
+                    AND a.node_type &lt;&gt; 3
+                OR (
+                            b.product_type = 4
+                            AND a.node_type = 5
+                        )
+                OR (
+                            b.product_type = 2
+                            AND a.node_type &lt;&gt; 4
+                        )
+            )
+        ORDER BY a.node_type,
+                 a.sort;
+
+
     </select>
     <select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.TyProductModel">
         select a.name, a.id
         from product_model_common a
         where a.is_delete = 0
-          and a.node_type != 1
+          and a.node_type &lt;&gt; 1
+        ORDER BY node_type, sort
     </select>
     <select id="getNo" resultType="java.lang.Integer">
         SELECT COUNT(*)
@@ -30,6 +45,7 @@
             <if test="pid==null">
                 and pid is null
             </if>
+            and node_type =${nodeType}
         </where>
         Group by node_type
     </select>

--
Gitblit v1.9.1