From 18b01cd45960e8eaf0b1b028c7269d158a646780 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Wed, 28 Aug 2024 09:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=89=E5=85=A8=E4=BA=8B?=
 =?UTF-8?q?=E6=95=85=E7=99=BB=E8=AE=B0=E9=99=84=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi                                         |  2 +-
 .../xyt/mapper/FileAssociationsMapper.java    | 21 +++++++++++++++++++
 .../xyt/service/FileAssociationsService.java  |  8 +------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ruoyi b/ruoyi
index 16e1fc9..d456ff1 160000
--- a/ruoyi
+++ b/ruoyi
@@ -1 +1 @@
-Subproject commit 16e1fc95534519a06bc1dca0df64ffceeb3c9931
+Subproject commit d456ff189647e16ffaaa170738d785eeee1253c0
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
index 4ed08bd..04a2fe1 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
@@ -35,4 +35,25 @@ public interface FileAssociationsMapper extends BaseMapper<FileAssociations> {
             </script>
             """)
     List<FileAssociations> getFiles(@Param("tableName") String tableName,@Param("businessId") String businessId);
+
+    @Select("""
+            <script>
+            SELECT
+            	fa.*,
+            	fd.file_name,
+            	fd.file_size,
+            	fd.file_path
+            FROM
+            	file_associations fa
+            	LEFT JOIN file_descriptor fd ON fa.file_id = fd.file_id
+            WHERE
+                fa.del = '1'
+                AND fa.business_id = #{businessId}
+                AND fa.type = #{type}
+            	AND fa."table_name" = #{tableName}
+            	AND fd.group_id = #{tableName}
+            ORDER BY fa.tm desc
+            </script>
+            """)
+    List<FileAssociations> queryFileList(@Param("businessId") String businessId,@Param("tableName") String tableName,@Param("type") String type);
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java b/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java
index 5e2f170..3af3cca 100644
--- a/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java
@@ -1,9 +1,7 @@
 package com.gunshi.project.xyt.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.project.xyt.mapper.FileAssociationsMapper;
 import com.gunshi.project.xyt.model.FileAssociations;
@@ -167,11 +165,7 @@ public class FileAssociationsService extends ServiceImpl<FileAssociationsMapper,
     }
 
     public List<FileAssociations> queryFileList(String businessId, String tableName,String type) {
-        LambdaQueryWrapper<FileAssociations> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(FileAssociations::getBusinessId,businessId)
-                .eq(FileAssociations::getTableName,tableName)
-                .eq(FileAssociations::getType,type);
-        return this.list(queryWrapper);
+        return this.baseMapper.queryFileList(businessId,tableName,type);
     }
 
 }