From fd6cd17c0f7a095be934f9e1d1fd7c3e10cad433 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 21 五月 2024 08:45:39 +0800
Subject: [PATCH] svgEditor以及RBD画图拖动自动吸附在一条线上

---
 modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
index 7c7b542..621053a 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml
@@ -13,9 +13,10 @@
         END AS productIdInit
         FROM
         product_model a
-        LEFT JOIN param_data b ON b.product_id = a.id and b.page_code = '${pageCode}'
+        LEFT JOIN param_data b ON b.product_id = a.id and b.page_code = '${pageCode}' and b.is_delete = 0
         <where>
             a.is_delete = 0
+            and a.product_type &lt;&gt; 10
             <if test="srcId!=null">
                 and a.pid =${srcId}
             </if>
@@ -26,9 +27,16 @@
                 and ${whereSql}
             </if>
         </where>
-        <if test="orderBySql!=null">
-            ORDER BY ${orderBySql}
-        </if>
+        ORDER BY
+        a.product_type,a.sort
+    </select>
+    <select id="getParamData" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
+        SELECT a.*
+        FROM param_data a
+        WHERE a.is_delete = 0
+          and a.product_id = #{productId}
+          and a.page_code = #{pageCode}
+        limit 1
     </select>
 
 </mapper>

--
Gitblit v1.9.1