Преглед на файлове

Merge branch 'feature/0721-tenant' into develop

liujc преди 1 година
родител
ревизия
ccc44e6eac
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

+ 3 - 1
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -59,7 +59,9 @@ public class UserOrderController extends BaseController {
     @ApiOperation(value = "查询导出", notes = "传入orderSearch")
     @PreAuthorize("@pcs.hasPermissions('userOrder/export')")
     public void export(@RequestBody OrderSearch query) {
-        List<UserOrderVo> userOrderVos = userOrderService.selectAllList(query);
+        query.setRows(-1);
+        IPage<UserOrderVo> pages = userOrderService.selectPage(PageUtil.getPage(query), query);
+        List<UserOrderVo> userOrderVos = pages.getRecords();
         List<UserOrderExport> list = new ArrayList<>();
         userOrderVos.forEach(o -> {
             UserOrderExport export = new UserOrderExport();