wangqifan 3 éve
szülő
commit
0bb2b57844

+ 3 - 1
src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -43,6 +43,8 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
 
     List<Asset> findByOrderId(Long orderId);
     List<Asset> findByOrderId(Long orderId);
 
 
+    Page<Asset> findByUserIdAndStatusAndCompanyIdAndNameLikeAndConsignment(Long userId, AssetStatus status, Long companyId, String name, Pageable pageable, Boolean consignment);
+
     @Query("select a from Asset a join Order o on o.assetId = a.id join Asset aa on aa.orderId = o.id where a.id = ?1")
     @Query("select a from Asset a join Order o on o.assetId = a.id join Asset aa on aa.orderId = o.id where a.id = ?1")
     Optional<Asset> findChild(Long id);
     Optional<Asset> findChild(Long id);
 
 
@@ -84,7 +86,7 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
     int updateCDN(Long id, String pic, String model3d, String minterAvatar,
     int updateCDN(Long id, String pic, String model3d, String minterAvatar,
                   String ownerAvatar, String detail);
                   String ownerAvatar, String detail);
 
 
-    Page<Asset> findByUserIdAndStatusAndCompanyIdAndNameLikeAndConsignment(Long userId, AssetStatus status, Long companyId, String name, Pageable pageable, Boolean consignment);
+    Page<Asset> findByUserIdAndStatusAndCompanyIdAndNameLike(Long userId, AssetStatus status, Long companyId, String name, Pageable pageable);
 
 
     List<Asset> findAllByOasisIdInAndStatusIn(List<Long> oasisIds, List<AssetStatus> assetStatuses);
     List<Asset> findAllByOasisIdInAndStatusIn(List<Long> oasisIds, List<AssetStatus> assetStatuses);