diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
index c438b629..3bf50142 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
@@ -38,7 +38,7 @@ public interface TbShopCategoryRepository extends JpaRepository<TbShopCategory,
     @Query("SELECT category FROM TbShopCategory category where category.tree IN :ids and category.id != category.tree")
     List<TbShopCategory> findChildren(@Param("ids")List<Integer> ids);
 
-    @Query(" SELECT category FROM TbShopCategory category where category.shopId = :shopId")
+    @Query(" SELECT category FROM TbShopCategory category where category.shopId = :shopId and (category.pid is null or category.pid != '')")
     Page<TbShopCategory> findAllBy(@Param("shopId") String shopId,Pageable pageable);
 
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
index a19dc962..15f90ae5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
@@ -91,7 +91,7 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
                 .filter(d -> d.getTree()==null || d.getId().equals(d.getTree()))
                 .collect(Collectors.toList());
 
-        return PageUtil.toPage(result, page.getTotalElements()-children.size());
+        return PageUtil.toPage(result, page.getTotalElements());
     }
 
 //    @Override