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

临时处理分页问题

liyuan преди 3 седмици
родител
ревизия
f3e4dda8a8

+ 4 - 1
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -200,7 +200,9 @@ public class StockDescController extends BladeController {
 			}
 		}
 		lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
-		IPage<PjStockDesc> pages = stockDescService.page(Condition.getPage(query), lambdaQueryWrapper);
+		IPage<PjStockDesc> iPage = Condition.getPage(query);
+		iPage.setSize(-1L);
+		IPage<PjStockDesc> pages = stockDescService.page(iPage, lambdaQueryWrapper);
 		if (!pages.getRecords().isEmpty()) {
 
 			List<PjGoodsFiles> goodsFilesList = new ArrayList<>();
@@ -519,6 +521,7 @@ public class StockDescController extends BladeController {
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(ParameterUtils.getStorageId()), PjStockDesc::getStorageId, ParameterUtils.getStorageId());
 		}else{
 			lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId());
+			lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageName()), PjStockDesc::getStorageName, stockDesc.getStorageName());
 		}
 		List<PjProductLaunch> pjProductLaunchList = new ArrayList<>();
 		if (ObjectUtil.isNotEmpty(stockDesc.getCname())) {