From 2e0e1c066659ae720599eccf2020b455f6fc0f93 Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Fri, 18 Mar 2022 15:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=92=8C?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E8=A1=A8=E9=83=A8=E5=88=86=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=90=8D?=
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    | 4 ++--
 .../src/main/java/com/ghy/goods/domain/GoodsCategory.java  | 5 ++++-
 ghy-goods/src/main/resources/mapper.goods/GoodsMapper.xml  | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

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 567968b2..2c84e689 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
@@ -22,8 +22,8 @@ public class Goods extends BaseEntity {
     @Excel(name = "编码")
     private String goodsCode;
 
-    @Excel(name = "公司id")
-    private Long companyId;
+    @Excel(name = "部门id")
+    private Long deptId;
 
     @Excel(name = "名称")
     private String goodsName;
diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java
index 810da574..3314bb4a 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java
@@ -27,8 +27,11 @@ public class GoodsCategory extends BaseEntity {
     @Excel(name = "父级编码", cellType = Excel.ColumnType.STRING)
     private Long parentCategoryId;
 
+    @Excel(name = "排序", cellType = Excel.ColumnType.STRING)
+    private String categorySort;
+
     @Excel(name = "级别 1级目录 2级目录", cellType = Excel.ColumnType.STRING)
-    private Long level;
+    private Integer level;
 
     @Excel(name = "类别类型. 1.服务类 2.商品类", cellType = Excel.ColumnType.STRING)
     private String type;
diff --git a/ghy-goods/src/main/resources/mapper.goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper.goods/GoodsMapper.xml
index db3fccb2..f13b5103 100644
--- a/ghy-goods/src/main/resources/mapper.goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper.goods/GoodsMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="GoodsResult" type="com.ghy.goods.domain.Goods">
         <id     property="goodsId"             column="goods_id"       />
         <result property="goodsCode"           column="goods_code"     />
-        <result property="companyId"           column="company_id"     />
+        <result property="deptId"              column="dept_id"     />
         <result property="goodsName"           column="goods_name"     />
         <result property="goodsPrice"          column="goods_price"        />
         <result property="goodsSort"           column="goods_sort"/>
@@ -23,7 +23,7 @@
     </resultMap>
 
     <sql id="selectGoods">
-        select goods_id, goods_code, company_id, goods_name, goods_price, goods_sort, goods_category_id,
+        select goods_id, goods_code, dept_id, goods_name, goods_price, goods_sort, goods_category_id,
                goods_img_url, goods_number, status, create_by, create_time, remark
         from goods
     </sql>
@@ -34,6 +34,9 @@
             <if test="goodsCode != null and goodsCode != ''">
                 AND goods_code like concat('%', #{goodsCode}, '%')
             </if>
+            <if test="deptId != null and deptId != 0">
+                AND dept_id = #{deptId}
+            </if>
         </where>
     </select>