From 3ca8ce266bf5b06556d80c78b31405e7a54aa4e5 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 24 六月 2024 11:01:13 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 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..828ae0b 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -4,20 +4,34 @@
 <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 *
+        from product_model_common
+        where is_delete = 0
+          AND (
+            -- 濡傛灉瀛愭煡璇㈣繑鍥炵粨鏋滀负绌猴紝鍒欐鏌.pid鏄惁涓虹┖
+                    (SELECT src_id FROM product_model WHERE id = ${pid}  AND is_delete = 0) IS NULL
+                    AND pid IS NULL
+                OR
+                -- 鍚﹀垯锛屾鏌.pid鏄惁鍦ㄥ瓙鏌ヨ缁撴灉涓�
+                    pid IN (
+                        SELECT src_id
+                        FROM product_model
+                        WHERE id = ${pid}
+                          AND is_delete = 0
+                    )
+            )
+        and ((node_type = 1) or (node_type &lt;&gt; 1 and id not in (select src_id from product_model where pid =
+        ${pid} and is_delete=0)))
+        ORDER BY
+            node_type,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 +44,7 @@
             <if test="pid==null">
                 and pid is null
             </if>
+            and node_type =${nodeType}
         </where>
         Group by node_type
     </select>

--
Gitblit v1.9.1