From 3c154fd37633d8f21494f3c3739360c32c766f4d Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Wed, 24 May 2023 10:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B95-?=
 =?UTF-8?q?24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java          | 2 +-
 .../cyf/biz/crudeoilstorage/CrudeOilStorageService.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java
index 9dd8622b..e9e13f31 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java
@@ -27,5 +27,5 @@ public interface CrudeOilStorageMapper extends BaseMapper<CrudeOilStorage> {
     void insertCrudeOilFiles(List<Map<String, String>> maps);
 
     @Select("select s.*,f.url from crude_oil_storage s inner join crude_oil_storage_file f on s.sid = f.mainSid where s.sid = #{sid}")
-    CrudeOilStorage selectStorageBySid(@Param("sid") String sid);
+    List<CrudeOilStorage> selectStorageBySid(@Param("sid") String sid);
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
index 0ca34309..b1d8f573 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
@@ -99,7 +99,7 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
 
     public ResultBean selectStorageBySid(String sid){
         ResultBean rb = new ResultBean();
-        CrudeOilStorage crudeOilStorage = baseMapper.selectStorageBySid(sid);
+        List<CrudeOilStorage> crudeOilStorage = baseMapper.selectStorageBySid(sid);
         if (crudeOilStorage == null){
             return rb.success().setMsg("该条入库记录没有详细信息");
         }