Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 2 месяцев назад
Родитель
Сommit
0f82a26c7e

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/PpointConfigAdminController.java

@@ -96,7 +96,7 @@ public class PpointConfigAdminController {
         Long productId = params.get("productId") != null ? Long.valueOf(params.get("productId").toString()) : null;
 
         Page<ProductPpoint> pageParam = new Page<>(page, size);
-        Map<String, Object> result = ppointService.adminList(pageParam, keyword, productId);
+        Map<String, Object> result = ppointService.adminList(pageParam, keyword, productId, null);
         return Result.success(result);
     }
 

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/service/PpointService.java

@@ -117,7 +117,7 @@ public class PpointService {
     /**
      * Admin list: paginated P-point configs with product name.
      */
-    public Map<String, Object> adminList(Page<ProductPpoint> pageParam, String keyword, Long productId) {
+    public Map<String, Object> adminList(Page<ProductPpoint> pageParam, String keyword, Long productId, List<Map<String, String>> sortSpecs) {
         LambdaQueryWrapper<ProductPpoint> wrapper = new LambdaQueryWrapper<ProductPpoint>()
                 .orderByDesc(ProductPpoint::getCreatedAt);
 
@@ -125,7 +125,7 @@ public class PpointService {
             wrapper.eq(ProductPpoint::getProductId, productId);
         }
 
-        SortUtil.applySort(wrapper);
+        SortUtil.applySort(wrapper, sortSpecs, null);
         Page<ProductPpoint> page = productPpointMapper.selectPage(pageParam, wrapper);
         List<ProductPpoint> records = page.getRecords();
 

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-945c33ac431ba181628603b62536b1abddb268c6
+43432dcfd5b65bf0076968554e661fcecdec232c