From b388b3a04433dca42b8abc19c4ffa5b68b98bfb4 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 20 Aug 2024 14:47:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=AD=98=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/dto/product/StockQueryDto.java    | 2 +-
 .../ysk/cashier/service/impl/productimpl/StockServiceImpl.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockQueryDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockQueryDto.java
index b1aed940..77814e33 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockQueryDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockQueryDto.java
@@ -12,7 +12,7 @@ public class StockQueryDto {
     private Double num;
     private Integer isStock;
     private String categoryId;
-    private boolean sort;
+    private String sort;
 
     public void setName(String name) {
         if (StringUtils.isNotBlank(name)) {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
index 19f70e4e..6ee1abff 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.ysk.cashier.service.impl.productimpl;
 
+import cn.hutool.core.util.StrUtil;
 import cn.ysk.cashier.dto.product.OutAndOnDto;
 import cn.ysk.cashier.dto.product.StockQueryDto;
 import cn.ysk.cashier.dto.product.TbProductDto;
@@ -73,7 +74,7 @@ public class StockServiceImpl implements StockService {
     @Override
     public Page queryAllV2(StockQueryDto criteria, Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page, size);
-        if (criteria.isSort()) {
+        if (StrUtil.isNotBlank(criteria.getSort()) && Boolean.parseBoolean(criteria.getSort())) {
             return tbProductSkuRepository.searchProStockV2ByDesc(criteria.getShopId(), criteria.getName(), criteria.getIsStock(), criteria.getCategoryId(),  pageable);
         }
         return tbProductSkuRepository.searchProStockV2(criteria.getShopId(), criteria.getName(), criteria.getIsStock(), criteria.getCategoryId(),  pageable);