diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
index 6e9ea8ab..8829e7f6 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
@@ -98,13 +98,22 @@ public class GoodsController extends BaseController {
         }
         List<Goods> list = goodsService.selectGoodsList(goods);
         list.forEach(one -> {
-            // 补全商品
+            // 补全商品服务区域
             List<GoodsArea> goodsAreas = goodsAreaService.selectByGoodsId(one.getGoodsId());
             one.setGoodsAreaList(goodsAreas);
 
-            // 补全商品类别
+            // 补全商品规格
             List<GoodsStandard> goodsStandards = goodsStandardService.selectByGoodsId(one.getGoodsId());
             one.setGoodsStandardList(goodsStandards);
+
+            // 补全商品类目及父级类目信息
+            GoodsCategory goodsCategory = goodsCategoryService.selectById(one.getDeptGoodsCategoryId());
+            one.setDeptGoodsCategoryName(goodsCategory.getGoodsCategoryName());
+            if (goodsCategory.getParentCategoryId() != null) {
+                GoodsCategory parGoodsCategory = goodsCategoryService.selectById(goodsCategory.getParentCategoryId());
+                one.setParGoodsCategoryId(parGoodsCategory.getGoodsCategoryId());
+                one.setParGoodsCategoryName(parGoodsCategory.getGoodsCategoryName());
+            }
         });
         return getDataTable(list);
     }
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
index 72d60a7a..5dc4c370 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
@@ -87,13 +87,13 @@ public class GoodsDeptCategoryController extends BaseController {
         try {
             if (deptGoodsCategory.getIsAllNode() == null || !deptGoodsCategory.getIsAllNode()) {
                 List<DeptGoodsCategory> list = deptGoodsCategoryService.listByStep(deptGoodsCategory);
-                if (!CollectionUtils.isEmpty(list)) {
+                if (!CollectionUtils.isEmpty(list) && list.get(0).getLevel() > 1) {
                     DeptGoodsCategory allGoodsNode = new DeptGoodsCategory();
                     allGoodsNode.setGoodsCategoryName("全部");
                     allGoodsNode.setIsAllNode(true);
                     resList.add(allGoodsNode);
-                    resList.addAll(list);
                 }
+                resList.addAll(list);
             }
             return AjaxResult.success(resList);
         } catch (Exception e) {
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 0606afc9..ad1ca4c4 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
@@ -43,8 +43,14 @@ public class Goods extends BaseEntity {
     @Excel(name = "类别id,必须是关联到系统的第三级目录")
     private Long deptGoodsCategoryId;
 
+    private String deptGoodsCategoryName;
+
     private List<Long> deptGoodsCategoryIds;
 
+    private Long parGoodsCategoryId;
+
+    private String parGoodsCategoryName;
+
     @Excel(name = "商品图片", cellType = Excel.ColumnType.IMAGE)
     private String goodsImgUrl;
 
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 0f088eaf..426b6a56 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -29,7 +29,7 @@
         FROM goods
     </sql>
     <sql id="selectGoodsWithArea">
-        SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id,
+        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
         FROM goods g
         LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id