Merge remote-tracking branch 'origin/develop_master' into develop_master

2022-10-20 14:13:53 +08:00
parent fe37063ba4 7fc50fb4e0
commit 04749fd69d
1 changed files with 3 additions and 1 deletions
@@ -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>