From 2841800731d48fee4f5fb3da827af99b1fcb410e Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 17 Dec 2022 00:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=8E=A5=E6=94=B6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java   | 2 ++
 ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
index ad1ca4c4..640a6a22 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
@@ -63,6 +63,8 @@ public class Goods extends BaseEntity {
     @Excel(name = "区域Id", cellType = Excel.ColumnType.NUMERIC)
     private Long areaId;
 
+    private Long exceptParentAreaId;
+
     private List<GoodsArea> goodsAreaList;
 
     private Map<Integer, List<GoodsImgs>> goodsImgsMap;
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 426b6a56..5fcbf990 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -30,7 +30,7 @@
     </sql>
     <sql id="selectGoodsWithArea">
         SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id, goods_unit,
-               dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark
+               dept_goods_category_id, goods_img_url, goods_video_url, status, g.create_by, g.create_time, g.remark
         FROM goods g
         LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id
     </sql>
@@ -93,6 +93,7 @@
 
     <select id="selectGoodsList" parameterType="com.ghy.goods.domain.Goods" resultMap="GoodsResult">
         <include refid="selectGoodsWithArea" />
+        LEFT JOIN sys_area sa ON sa.area_id = ga.country_area_id
         <where>
             <if test="goodsCode != null and goodsCode != ''">
                 AND goods_code like concat('%', #{goodsCode}, '%')
@@ -109,6 +110,9 @@
             <if test="areaId != null and areaId != ''">
                 AND country_area_id = #{areaId}
             </if>
+            <if test="exceptParentAreaId != null">
+                AND sa.parent_code != #{exceptParentAreaId}
+            </if>
             <if test="goodsName != null and goodsName != ''">
                 AND goods_name like concat('%', #{goodsName}, '%')
             </if>