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 |   50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 2a83753..17a7338 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -4,10 +4,10 @@
 <mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao">
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
-        select a.*
-        from product_model a
+        select *
+        from product_model
         <where>
-            a.is_delete = 0
+            is_delete = 0
             <if test="pid!=null">
                 and pid =${pid}
             </if>
@@ -18,7 +18,8 @@
                 and ${whereSql}
             </if>
         </where>
-            ORDER BY sort
+        ORDER BY
+        product_type,sort
     </select>
     <select id="getNo" resultType="java.lang.Integer">
         SELECT COUNT(*)
@@ -31,7 +32,9 @@
             <if test="pid==null">
                 and pid is null
             </if>
+            and product_type =${productType}
         </where>
+        Group by product_type
     </select>
     <select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select a.name, a.id
@@ -40,10 +43,11 @@
           and a.product_type = 5
     </select>
     <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
-        SELECT a.operat_img               as imgPath,
+        SELECT a.operat_img                as imgPath,
                a.`NAME`                    as imgName,
                'node'                      as nodeType,
                ''                          as nodeTypeExt,
+               s.svg_content               as svgContent,
                s.width                     as imgWidth,
                s.height                    as imgHeight,
                a.id                        as dataId,
@@ -62,7 +66,34 @@
                  left join sys_picture_base s on s.id = a.operat_img
         WHERE a.is_delete = 0
           AND ((a.PID = ${productId})
-                or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10)  and a.product_type &lt;&gt; 10))
+            or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and
+                a.product_type &lt;&gt; 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 &lt;&gt; ${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">
@@ -71,4 +102,11 @@
         where a.is_delete = 0
           and a.product_type = 4
     </select>
+    <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+        select a.*
+        from product_model a
+        where a.is_delete = 0
+          and a.id = #{id}
+    </select>
+
 </mapper>

--
Gitblit v1.9.1