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 | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
index 344618a..fafc06e 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -4,22 +4,28 @@
<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.TyProductModelDao">
<select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.TyProductModel">
- SELECT PMC.*
- FROM product_model_common PMC
+ SELECT a.*
+ FROM product_model_common a
JOIN (SELECT product_type, src_id
FROM product_model
- WHERE id = ${pid} AND is_delete = 0) AS PM ON TRUE
- WHERE PMC.is_delete = 0
+ WHERE id = ${pid} AND is_delete = 0) AS b
+ WHERE a.is_delete = 0
AND (
- PM.product_type = 3
- AND (CASE WHEN pm.src_id IS NULL THEN node_type > 3 ELSE pid IN (src_id) END)
+ b.product_type = 3
+ AND a.node_type <> 3
OR (
- PM.product_type != 3
- AND (CASE WHEN pm.src_id IS NULL THEN pid IS NULL ELSE pid IN (src_id) END)
+ b.product_type = 4
+ AND a.node_type = 5
+ )
+ OR (
+ b.product_type = 2
+ AND a.node_type <> 4
)
)
- ORDER BY PMC.node_type,
- PMC.sort;
+ 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
--
Gitblit v1.9.1