فهرست منبع

Revert "fix: vip课酬与订单导出"

This reverts commit e13405c9
Joburgess 4 سال پیش
والد
کامیت
c623d6a047
1فایلهای تغییر یافته به همراه2 افزوده شده و 4 حذف شده
  1. 2 4
      mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

+ 2 - 4
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1045,14 +1045,12 @@ public class ExportController extends BaseController {
             queryInfo.setUserIds(userIds);
         }
         queryInfo.setPage(1);
-        if(StringUtils.isBlank(queryInfo.getSearch())||!"ALL".equals(queryInfo.getSearch())){
-            queryInfo.setRows(49999);
-        }
+        queryInfo.setRows(49999);
         queryInfo.setIsExport(true);
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
         List<StudentPaymentOrderExportDto> studentPaymentOrderExportDtos = studentPaymentOrderService.ExportQueryPage(params);
-        if ((StringUtils.isBlank(queryInfo.getSearch())||!"ALL".equals(queryInfo.getSearch())) && studentPaymentOrderExportDtos.size() > 50000) {
+        if (studentPaymentOrderExportDtos.size() > 50000) {
             throw new BizException("数据集太大,不能导出.最大数据集不能超过50000");
         }
         OutputStream outputStream = response.getOutputStream();