From fe295552e5a3b010b5a6a60a1e2a94bc39b49d68 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 06 八月 2024 15:37:09 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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..60c39a8 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -70,7 +70,7 @@
                p.repair_mttcr_other_params3 as repairMttcrOtherParams3
         FROM product_model a
                  left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306'
-                 left join param_data p on p.product_id = a.id and p.page_code = 'expect'
+                 left join param_data p on p.product_id = a.id
                  left join sys_picture_base s on s.id = a.operat_img
         WHERE a.is_delete = 0
           AND ((a.PID = ${productId})
@@ -109,6 +109,7 @@
         from product_model a
         where a.is_delete = 0
           and a.product_type = 2
+        order by sort
     </select>
     <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select a.*
@@ -133,9 +134,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