2023年2月15日18:40:48

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxItemController.java

@@ -39,6 +39,7 @@ import org.springblade.box.tube.vo.TradingBoxItemVO;
 import org.springblade.box.tube.service.ITradingBoxItemService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -84,10 +85,13 @@ public class TradingBoxItemController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入tradingBoxItem")
 	public R<List<TradingBoxItem>> list(TradingBoxItem tradingBoxItem) {
+		if (ObjectUtils.isNull(tradingBoxItem.getPid())){
+			return R.data(new ArrayList<>());
+		}
 		LambdaQueryWrapper<TradingBoxItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
 			.eq(TradingBoxItem::getIsDeleted, 0)
-			.eq(ObjectUtils.isNotNull(tradingBoxItem.getPid()),TradingBoxItem::getPid, tradingBoxItem.getPid())
+			.eq(TradingBoxItem::getPid, tradingBoxItem.getPid())
 			.like(ObjectUtils.isNotNull(tradingBoxItem.getCode()), TradingBoxItem::getCode, tradingBoxItem.getCode())//箱号
 			.eq(ObjectUtils.isNotNull(tradingBoxItem.getStatus()), TradingBoxItem::getStatus, tradingBoxItem.getStatus())//状态
 			.eq(ObjectUtils.isNotNull(tradingBoxItem.getBoxTypeId()), TradingBoxItem::getBoxTypeId, tradingBoxItem.getBoxTypeId());//箱类型