From 7e4299eecc8d67a185edbdcdc97af58e052bfa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Sat, 20 Jul 2024 16:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=97=E6=9D=90=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=80=9A=E8=BF=87=E5=BA=97=E9=93=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/cons/repository/TbConsInfoFlowRepository.java | 8 ++++----
 .../cons/service/impl/TbConsInfoFlowServiceImpl.java      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
index 26d7f1d1..90c0a8d6 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
@@ -16,10 +16,10 @@ public interface TbConsInfoFlowRepository extends JpaRepository<TbConsInfoFlow,
     @Query(value = "SELECT\n" +
             "\tp.`name` \n" +
             "FROM\n" +
-            "\ttb_cons_info_flow i\n" +
-            "\tLEFT JOIN tb_product_sku s ON i.pro_sku_id = s.id\n" +
-            "\tLEFT JOIN tb_product p ON s.product_id = p.id\n" +
-            "\twhere i.pro_sku_id=?1 limit 1",nativeQuery = true)
+            "\ttb_product_sku s\n" +
+            "\tLEFT JOIN tb_product p ON s.product_id = p.id \n" +
+            "WHERE\n" +
+            "\ts.id = ?1",nativeQuery = true)
     String selectByPskId(Integer skuId);
 
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
index 584f9d26..7ad1151f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
@@ -45,7 +45,7 @@ public class TbConsInfoFlowServiceImpl implements TbConsInfoFlowService {
         Page<TbConsInfoFlow> page = tbConsInfoFlowRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
 
        page.get().forEach(it->{
-          String name=  tbConsInfoFlowRepository.selectByPskId(it.getConsId());
+          String name=  tbConsInfoFlowRepository.selectByPskId(it.getProSkuId());
           if(Objects.nonNull(name)){
               it.setProductName(name);
           }