czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-10-14 14:56:57 +08:00
parent 1cc7188488 5468fa56de
commit bf5e5ec7dd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
View File

@@ -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") @Query("SELECT category FROM TbShopCategory category where category.tree IN :ids and category.id != category.tree")
List<TbShopCategory> findChildren(@Param("ids")List<Integer> ids); 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); Page<TbShopCategory> findAllBy(@Param("shopId") String shopId,Pageable pageable);

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
View File

@@ -91,7 +91,7 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
.filter(d -> d.getTree()==null || d.getId().equals(d.getTree())) .filter(d -> d.getTree()==null || d.getId().equals(d.getTree()))
.collect(Collectors.toList()); .collect(Collectors.toList());
return PageUtil.toPage(result, page.getTotalElements()-children.size()); return PageUtil.toPage(result, page.getTotalElements());
} }
// @Override // @Override