From ea744c63bf10f14fe5a51addf37083c384093e21 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 17:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index b85f6bd..1d33f52 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -133,9 +133,12 @@
</if>
</select>
<select id="getProductPath" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
- select *
- from product_model
- where IS_DELETE = 0
- and ship_id =${shipId}
+ select a.*, b.id as paramId
+ from product_model a,
+ param_data b
+ where a.IS_DELETE = 0
+ and b.IS_DELETE = 0
+ and a.ship_id = ${shipId}
+ and a.id = b.product_id
</select>
</mapper>
--
Gitblit v1.9.1