update

src/main/java/com/example/afrishop_v3/controllers/AdvertisementController.java

@@ -46,7 +46,7 @@ public class AdvertisementController {
      */
     @GetMapping("/info/{link}")
     public Result getAdvertisementById(@PathVariable("link") String link,
-                                       @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
+                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                        @RequestParam(value = "pageSize", defaultValue = "12") Integer pageSize,
                                        @RequestParam(value = "order", required = false) String order) {
         LinkedHashMap advertisementMap = new LinkedHashMap();
@@ -62,7 +62,7 @@ public class AdvertisementController {
                 advertisement.setStatus(3);
             }
 
-            List<TbCfStationItem> itemList = itemRepository.getAdvertisementItem(advertisement.getId(), PageRequest.of(pageNum - 1, pageSize, sort(order))).toList();
+            List<TbCfStationItem> itemList = itemRepository.getAdvertisementItem(advertisement.getId(), PageRequest.of(pageNum - 1, pageSize)).toList();
             advertisementMap.put("advertisement", advertisement);
             advertisementMap.put("itemList", itemList);
         }
@@ -72,9 +72,6 @@ public class AdvertisementController {
 
     private Sort sort(String order) {
         String col = "discountPrice";
-        if (StringUtils.isBlank(order)) {
-            col = "sort";
-        }
         return Sort.by(order(order, col));
     }
 

src/main/java/com/example/afrishop_v3/repository/TbCfStationItemRepository.java

@@ -36,7 +36,7 @@ public interface TbCfStationItemRepository extends PagingAndSortingRepository<Tb
 
     List<TbCfStationItem> findAllByItemDescritionId(String id);
 
-    @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1 ")
+    @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1 order by a.sort")
     Page<TbCfStationItem> getAdvertisementItem(String adId, Pageable pageable);
 
 }