‘linchangsheng’ hai 1 mes
pai
achega
716157f5c2

+ 2 - 2
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/OrderBaseController.java

@@ -50,8 +50,8 @@ public class OrderBaseController {
             @ApiParam(value = "1=今天 2=明天 3=其他",required = false) @RequestParam(required = false) Integer byDay,
             @ApiParam(value = "开始时间",required = false) @RequestParam(required = false) String startTime,
             @ApiParam(value = "结束时间",required = false) @RequestParam(required = false) String endTime,
-            @ApiParam(value = "页号",required = true,defaultValue = "1") @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true,defaultValue = "10") @RequestParam Integer pageSize
+            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
+            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
     ) throws Exception{
         IPage<OrderBaseVO> list = orderBaseLogic.list(keyword,pgIncreOrderId,isYb,isWb, orderBaseStatus, byDay, startTime, endTime, pageNum, pageSize);
         return ResponseHelper.success(list);

+ 5 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -28,6 +28,7 @@ import com.gree.mall.miniapp.plus.service.*;
 import com.gree.mall.miniapp.utils.DateUtils;
 import com.gree.mall.miniapp.utils.StringUtil;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -54,6 +55,7 @@ import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 @Service
+@Slf4j
 public class OrderBaseLogic {
 
     private final PgOrderBaseService pgOrderBaseService;
@@ -665,7 +667,10 @@ public class OrderBaseLogic {
         }
 
 
+        log.info("打印页数"+pageSize);
 
+        if (pageSize == null)
+            pageSize = 10;
 
         // 创建分页请求
         Pageable pageable = PageRequest.of(pageNum-1, pageSize);