From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 <> 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 <> ${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