1

zj

2024-09-04 677c87ad5b0057a09381cfe023e857229aa770dd

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

@@ -171,12 +171,12 @@
    @Override
    public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
        List<Stock> stockList = new ArrayList<>();
        if(stockType.equals(EStockType.US.getCode())){
        if(stockType.equals("dz")){
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
            stockList.addAll(stockMapper.findStockTypeDz(orderBy,stockType, keyWords));
        }else{
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockTypeDz(orderBy,EStockType.US.getCode(), keyWords));
            stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
        }

        List<StockListVO> stockListVOS = Lists.newArrayList();