From 7fc50fb4e0b9baf21ef5ffe612d4170d3d8ce0a6 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 18 Oct 2022 09:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
index 8c0c737d..3c7f87e8 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
@@ -18,7 +18,8 @@
     </update>
     <select id="getFileMaterialPage" resultType="com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial">
         SELECT
-          fm.*,zd.id as treeId,zt.name as treeName
+          fm.id, fm.data_type, fm.data_title, fm.data_upload_time, fm.data_explain, fm.attach_file_id, fm.click_count,
+          fm.is_top, fm.del_flag, fm.is_show, zd.id as treeId, zt.name as treeName
         FROM
             file_material fm
             LEFT JOIN zl_data zd ON zd.data_id=fm.id
@@ -49,6 +50,7 @@
         <if test="flieM.endDataUploadTime != null ">
             AND fm.data_upload_time &lt;= #{flieM.endDataUploadTime}
         </if>
+        group by fm.id
         order by fm.data_upload_time desc
     </select>
 </mapper>