From 8c834663344b1cc9c2ca569e6911900edd407f73 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 06 六月 2024 16:44:14 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 9dbaf1e..17a7338 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -32,7 +32,7 @@
             <if test="pid==null">
                 and pid is null
             </if>
-        and product_type =${productType}
+            and product_type =${productType}
         </where>
         Group by product_type
     </select>
@@ -68,6 +68,32 @@
           AND ((a.PID = ${productId})
             or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and
                 a.product_type &lt;&gt; 10))
+          and a.id not in (
+            select node_id
+            from model_rbd_node
+            where product_id in (
+                select pid
+                from product_model
+                where id = ${productId}
+                  and is_delete = 0
+                union
+                select id
+                from product_model
+                where is_delete = 0
+                  and pid = ${parentId}
+                  and id &lt;&gt; ${productId}
+            )
+            union
+            select node_id
+            from model_rbd_node
+            where product_id in (
+                select id
+                from product_model
+                where is_delete = 0 and pid = ${productId}
+            )
+        )
+
+
 
     </select>
     <select id="getTaskProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">

--
Gitblit v1.9.1