diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
index 0007619..963752c 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
@@ -84,8 +84,8 @@ public interface ShopGoodsMapper extends BaseMapper<ShopGoodsEntity> {
             "WHERE g.deleted = 0 AND g.belong_type = 0 AND sc.deleted = 0 AND sc.shop_id = #{shopId} AND cc.deleted = 0 AND cc.goods_id IS NOT NULL ")
     List<SearchGoodsWithCabinetDO> getGoodsWithCabinetListByShopId(@Param("shopId")Long shopId);
 
-    @Select("SELECT g.goods_id, g.goods_name, g.category_id, g.price, " +
-            "g.stock, g.status, g.auto_approval, g.cover_img, g.goods_detail, g.usage_instruction, SUM(cc.stock) AS total_stock, " +
+    @Select("SELECT g.*, " +
+            "SUM(cc.stock) AS total_stock, " +
             "GROUP_CONCAT(DISTINCT cc.cell_no) AS cell_no_str, " +
             "GROUP_CONCAT(DISTINCT sc.cabinet_name) AS cabinet_name " +
             "FROM shop_goods g " +
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java
index a877d43..2651a9f 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java
@@ -32,7 +32,7 @@ public class SearchShopGoodsQuery<T> extends AbstractPageQuery<T> {
             .ge(minPrice != null, "g.price", minPrice)
             .le(maxPrice != null, "g.price", maxPrice)
             .eq(belongType != null, "g.belong_type", belongType)
-            .eq("g.external_goods_id", externalGoodsId)
+            .eq(externalGoodsId != null, "g.external_goods_id", externalGoodsId)
             .eq("g.deleted", 0)
             .groupBy("g.goods_id");