From b5b588eb2cd0681894bc5874a039c69e5279ca66 Mon Sep 17 00:00:00 2001
From: huk <hu_care_you@163.com>
Date: Sat, 20 Sep 2025 14:09:25 +0800
Subject: [PATCH] =?UTF-8?q?```=20feat(goods):=20=E4=BC=98=E5=8C=96=20SKU?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E6=A0=87=E8=AE=B0=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=9C=A8=20SkuMapper.xml=20=E7=9A=84=20getLi?=
 =?UTF-8?q?st=20=E6=9F=A5=E8=AF=A2=E4=B8=AD=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AF=B9=20sku=20=E5=92=8C=20product=20=E8=A1=A8=E7=9A=84=20de?=
 =?UTF-8?q?l=5Fflag=20=3D=20'0'=20=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E4=BB=85=E5=8C=85=E5=90=AB=E6=9C=AA=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82=E5=90=8C=E6=97=B6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20SQL=20=E6=A0=BC=E5=BC=8F=E4=BB=A5=E6=8F=90=E5=8D=87=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E6=80=A7=E3=80=82```?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/goods/SkuMapper.xml | 75 +++++++++----------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml
index a93d4fa59..396c54d6f 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml
@@ -15,46 +15,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="getlist" resultType="com.wzj.soopin.goods.domain.vo.SkuVO">
-        SELECT
-            s.id,
-            s.product_id,
-            s.out_sku_id,
-            s.price,
-            s.pic,
-            s.sp_data,
-            s.stock,
-            s.create_by,
-            s.create_time,
-            s.update_by,
-            s.update_time,
-            p.name AS productName
+        SELECT s.id,
+               s.product_id,
+               s.out_sku_id,
+               s.price,
+               s.pic,
+               s.sp_data,
+               s.stock,
+               s.create_by,
+               s.create_time,
+               s.update_by,
+               s.update_time,
+               p.name AS productName
         FROM
-            pms_sku s
-        LEFT JOIN
-            pms_product p ON s.product_id = p.id
-        <where>
-            <if test="query.productName != null and query.productName != ''">
-                AND p.name LIKE CONCAT('%', #{query.productName}, '%')
-            </if>
-            <if test="query.productId != null">
-                AND p.id = #{query.productId}
-            </if>
-            <if test="query.outSkuId != null and query.outSkuId != ''">
-                AND s.out_sku_id LIKE CONCAT('%', #{query.outSkuId}, '%')
-            </if>
-            <if test="query.price != null">
-                AND s.price = #{query.price}
-            </if>
-            <if test="query.pic != null and query.pic != ''">
-                AND s.pic LIKE CONCAT('%', #{query.pic}, '%')
-            </if>
-            <if test="query.tenantId != null and query.tenantId != ''">
-                AND s.tenant_id = #{query.tenantId}
-            </if>
-
-        </where>
-        ORDER BY
-            s.create_time DESC
+        pms_sku s
+            LEFT JOIN
+        pms_product p ON s.product_id = p.id
+            and s.del_flag = '0' and p.del_flag = '0'
+        <if test="query.productName != null and query.productName != ''">
+            AND p.name LIKE CONCAT('%', #{query.productName}, '%')
+        </if>
+        <if test="query.productId != null">
+            AND p.id = #{query.productId}
+        </if>
+        <if test="query.outSkuId != null and query.outSkuId != ''">
+            AND s.out_sku_id LIKE CONCAT('%', #{query.outSkuId}, '%')
+        </if>
+        <if test="query.price != null">
+            AND s.price = #{query.price}
+        </if>
+        <if test="query.pic != null and query.pic != ''">
+            AND s.pic LIKE CONCAT('%', #{query.pic}, '%')
+        </if>
+        <if test="query.tenantId != null and query.tenantId != ''">
+            AND s.tenant_id = #{query.tenantId}
+        </if>
+        ORDER BY s.create_time DESC
     </select>
 
 
@@ -68,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             pms_product p ON s.product_id = p.id
         WHERE
             s.id = #{id}
+        and s.del_flag = '0'
     </select>
 
 </mapper>