修改商品和类别表部分实体的字段名

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")
+    @Excel(name = "部门id")
-    private Long companyId;
+    private Long deptId;
 
     @Excel(name = "名称")
     private String goodsName;

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;

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>