1

zj

2024-05-20 b7ef37cebb85e45006170422b67d74c357b89540

 src/main/java/com/nq/service/impl/StockServiceImpl.java

@@ -125,7 +125,10 @@

    public ServerResponse getStock(int pageNum, int pageSize, String keyWords, String stockPlate, String stockType, HttpServletRequest request) {
        List<Stock> stockList = new ArrayList<>();
        if (stockType.equals("99")) {
        if(null == stockType){
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0), pageNum - 1, pageSize));
        }else if (stockType.equals("99")) {
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "IN", Integer.valueOf(0)));
        } else if (stockType.equals("100")) {
@@ -147,7 +150,7 @@
                dzStock.setStockType(stockDz.getStockType());
                stockList.add(dzStock);
            }
        } else {
        }else {
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0), pageNum - 1, pageSize));
        }