|
|
@@ -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;
|