From 9ef61aec5e8b218db9d60941ef3ad576a927338b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
index bf36c33..84fa2fc 100644
--- a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
@@ -11,13 +11,23 @@
     </update>
     <update id="updateProdeuctImg">
         UPDATE product_model_common
-        set  operat_img = ${id}
-        where node_type = ${productType}
-          and is_delete = 0;
-        update product_model
+        set operat_img = ${id}
+        <where>
+            node_type = ${productType}
+            and is_delete = 0
+            <if test="pictureBaseId!=null">
+                and operat_img =${pictureBaseId}
+            </if>
+        </where>
+        ;update product_model
         set operat_img=${id}
-        where product_type = ${productType}
-          and is_delete = 0
+        <where>
+            product_type = ${productType}
+            and is_delete = 0
+            <if test="pictureBaseId!=null">
+                and operat_img =${pictureBaseId}
+            </if>
+        </where>
     </update>
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase">
@@ -33,4 +43,11 @@
             ORDER BY ${orderBySql}
         </if>
     </select>
+    <select id="getDefaultImg" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase">
+        select a.name, a.id
+        from sys_picture_base a
+        where a.is_delete = 0
+          and a.is_default = 1
+          and a.product_type = ${productType}
+    </select>
 </mapper>

--
Gitblit v1.9.1