学习园地 - 我的学习页面数据排序（按截至日期倒序）

ruoyi-system/src/main/resources/mapper/branch/TBranchLearningMapper.xml

@@ -41,7 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTBranchLearningList" parameterType="TBranchLearning" resultMap="TBranchLearningResult">
         <include refid="selectTBranchLearningVo"/>
-        <where>  
+        <where>
+            <if test="fileName != null "> and f.name like concat(concat('%', #{fileName}), '%') </if>
             <if test="learningId != null "> and u.learning_id = #{learningId}</if>
             <if test="userId != null "> and u.user_id = #{userId}</if>
             <if test="fileId != null "> and u.file_id = #{fileId}</if>
@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by u.is_signed asc, u.learning_status asc, u.learning_deadline asc
+        order by u.is_signed asc, u.learning_status asc, u.learning_deadline desc
     </select>
     
     <select id="selectTBranchLearningByLearningId" parameterType="Long" resultMap="TBranchLearningResult">