licailing 3 роки тому
батько
коміт
ade75527f2

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

@@ -41,6 +41,6 @@ public interface OrderRepo extends JpaRepository<Order, Long>, JpaSpecificationE
 
     long countAllByPayTimeAfter(LocalDateTime payTime);
 
-    @Query("select assetId from Order where userId = ?1 and opened = false")
+    @Query("select id from Order where userId = ?1 and opened = false")
     List<Long> findAllByUserIdAndOpenedFalse(Long userId);
 }

+ 2 - 2
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -56,9 +56,9 @@ public class AssetService {
         Page<Asset> all = assetRepo.findAll(JpaUtils.toSpecification(pageQuery, Asset.class), JpaUtils.toPageRequest(pageQuery));
         Map<String, Object> query = pageQuery.getQuery();
         if (ObjectUtil.isNotEmpty(query.get("userId"))) {
-            List<Long> assetId = orderRepo.findAllByUserIdAndOpenedFalse(Convert.convert(Long.class, query.get("userId")));
+            List<Long> orderId = orderRepo.findAllByUserIdAndOpenedFalse(Convert.convert(Long.class, query.get("userId")));
             return all.map(asset -> {
-                if (assetId.contains(asset.getId())){
+                if (orderId.contains(asset.getOrderId())){
                     asset.setOpened(false);
                 }
                 return asset;