diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml
index 353c422..02dfde7 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml
@@ -116,7 +116,7 @@
         <if test="query.brandId!=null and query.brandId!=''">
           and brandId =#{query.brandId}
         </if>
-        <if test="query.categoryId!=null and query.categoryId!=''">
+        <if test="query.categoryId!=null and query.categoryId!='' and query.categoryId!=0 ">
           and categoryId=#{query.categoryId}
         </if>
         <if test="query.name!=null and query.name!=''">
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
index 1a2cf22..89d807b 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
@@ -247,6 +247,10 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         ResultBean rb=new ResultBean().fail();
         GoodsTypeVo vo=new GoodsTypeVo();
         List<GoodsTypeVo> list=baseMapper.getType();
+        GoodsTypeVo vo1=new GoodsTypeVo();
+        vo1.setName("全部分类");
+        vo1.setId("0");
+        list.add(0,vo1);
         vo.setTypeVos(list);
         List<BrandVo> list1= IPmsBrandService.getList().getData();
         vo.setBrandVos(list1);