From 03ffeb61bbdb1e93145b133dc367b9b7c62e9af1 Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Wed, 24 May 2023 11:18:04 +0800
Subject: [PATCH] =?UTF-8?q?5-24=E5=8E=9F=E6=B2=B9=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java  | 2 +-
 .../crudeoilinventoryrecord/CrudeOilInventoryRecordService.java | 2 +-
 .../cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java        | 2 +-
 .../cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java
index be59d9ba..b2aea749 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.java
@@ -25,5 +25,5 @@ public interface CrudeOilInventoryRecordMapper extends BaseMapper<CrudeOilInvent
     CrudeOilInventoryRecord getCrudeBySid(@Param("sid")String sid);
     void insertCrudeOilFiles(List<Map<String, String>> maps);
 
-    CrudeOilInventoryRecord selectRecordBySid(@Param("sid") String sid);
+    List<CrudeOilInventoryRecord> selectRecordBySid(@Param("sid") String sid);
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java
index be6f0ca6..ec579b52 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java
@@ -93,7 +93,7 @@ public class CrudeOilInventoryRecordService extends MybatisBaseService<CrudeOilI
 
     public ResultBean selectRecordBySid(String sid){
         ResultBean rb = ResultBean.fireFail();
-        CrudeOilInventoryRecord crudeOilInventoryRecord = baseMapper.selectRecordBySid(sid);
+        List<CrudeOilInventoryRecord> crudeOilInventoryRecord = baseMapper.selectRecordBySid(sid);
         return rb.success().setData(crudeOilInventoryRecord);
     }
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java
index b24ef000..65ab3be8 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.java
@@ -22,7 +22,7 @@ public interface CrudeOilOutboundMapper extends BaseMapper<CrudeOilOutbound> {
     IPage<CrudeOilOutboundVo> selectPageVo(IPage<CrudeOilOutbound> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilOutbound> qw);
 
     @Select("select o.*,f.url from crude_oil_outbound o inner join crude_oil_outbound_file f on o.sid = f.mainSid where o.sid=#{sid}")
-    CrudeOilOutbound getCrudeBySid(@Param("sid")String sid);
+    List<CrudeOilOutbound> getCrudeBySid(@Param("sid")String sid);
 
     void insertCrudeOilFiles(List<Map<String, String>> maps);
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
index c1a873dc..71a7b06b 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
@@ -89,7 +89,7 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
     }
     public ResultBean getCrudeBySid(String sid){
         ResultBean rb=new ResultBean();
-        CrudeOilOutbound CrudeOilOutbound=baseMapper.getCrudeBySid(sid);
+        List<CrudeOilOutbound> CrudeOilOutbound=baseMapper.getCrudeBySid(sid);
         return  rb.success().setData(CrudeOilOutbound);
     }
     public ResultBean del(String sid){