commit

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

@@ -50,18 +50,19 @@ public class GoodsTypeController {
             pageSize = 6;
         }
 
-        if( categoryId != null){
-            itemRepository.findByItemCategory(categoryId,PageRequest.of(pageNum, pageSize,sort(order)));
-        }
+        Page<TbCfStationItem> all;
 
-        Page<TbCfStationItem> all = itemRepository.findAll(PageRequest.of(pageNum, pageSize,sort(order)));
+        if (categoryId != null)
+            all = itemRepository.findByItemCategory(categoryId, PageRequest.of(pageNum, pageSize, sort(order)));
+        else
+            all = itemRepository.findAll(PageRequest.of(pageNum, pageSize, sort(order)));
 
         return new Result<>(all);
     }
 
 
-    private Sort sort(String order){
+    private Sort sort(String order) {
         String col = "discountPrice";
-        return Sort.by( "desc".equals(order) ? desc(col) : asc(col));
+        return Sort.by("desc".equals(order) ? desc(col) : asc(col));
     }
 }