From 1eb9493fea5343db76f91ce30bfab5e38c5b2ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 23 May 2024 14:59:41 +0800 Subject: [PATCH] no message --- .../main/java/com/zhehekeji/web/service/StockService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index dd651cb..f8ab44a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -412,15 +412,14 @@ public class StockService { public Stock stockInfo(StockCheck stockCheck) { Street street = streetMapper.selectOne(new QueryWrapper() - .eq(stockCheck.getStreetPlc()!=null,"plc_Id", stockCheck.getStreetPlc()) + .eq(stockCheck.getStreetPlc()!=null&& !"".equals(stockCheck.getStreetPlc()),"plc_Id", stockCheck.getStreetPlc()) .eq(stockCheck.getStreetId()!=null,"id", stockCheck.getStreetId())); Stock stock = stockMapper.selectOne(new QueryWrapper().eq("`row`", stockCheck.getRow()) .eq("`column`", stockCheck.getColumn()) .eq("`direction`", stockCheck.getDirection()) .eq("`side`", stockCheck.getSide()) - .eq(stockCheck.getStreetId()!=null,"`street_id`", stockCheck.getStreetId()) - .eq(stockCheck.getStreetPlc()!=null,"`street_id`", stockCheck.getStreetPlc())); + .eq(street.getId()!=null,"`street_id`", stockCheck.getStreetId())); if (stock == null) { stock = new Stock(); stock.setColumn(stockCheck.getColumn());