Browse Source

2022年11月9日19:23:39

纪新园 3 years ago
parent
commit
9cd4a75510

+ 2 - 2
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/partsapp/AppPartsController.java

@@ -124,7 +124,7 @@ public class AppPartsController extends BladeController {
 		} else {
 			lambdaQueryWrapper.like(Func.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId());//客户id
 		}
-		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order),Order::getSalesName, order.getSalesName());//业务员
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getSalesName()),Order::getSalesName, order.getSalesName());//业务员
 		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getContractStartDate()), Order::getBusinesDate, order.getContractStartDate());//合同日期开始
 		lambdaQueryWrapper.le(Func.isNotEmpty(order.getContractEndDate()), Order::getBusinesDate, order.getContractEndDate());//合同日期结束
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getSrcOrderNo()), Order::getSrcOrderNo, order.getSrcOrderNo());//订单来源
@@ -326,7 +326,7 @@ public class AppPartsController extends BladeController {
 		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.SALES.getType());
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.PARTS.getType());
 		lambdaQueryWrapper.eq(Order::getConfirmStatus, 1);
-		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order),Order::getSalesName, order.getSalesName());//业务员
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getSalesName()),Order::getSalesName, order.getSalesName());//业务员
 		List<Order> orderList = orderService.list(lambdaQueryWrapper);
 
 		BigDecimal total = new BigDecimal("0.00");