修改bug

2025-07-28 11:00:41 +08:00
parent 30c2654dea
commit ddf399b7b1
12 changed files with 230 additions and 52 deletions
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaExpressMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaExpressMapper.xml
@@ -50,7 +50,7 @@
                 left join sys_user su on su.user_id = oe.owner_id
                 left join sys_oa_project sop on sop.project_id = oe.project_id
                 left join oa_report_detail ord on ord.detail_id = oe.detail_id
-            ${ew.getCustomSqlSegment}
+            ${ew.customSqlSegment}
    </select>
    <select id="selectVoByIdPlus" resultType="com.ruoyi.oa.domain.vo.OaExpressVo">
        select oe.express_id,
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaReportSummaryMapper.xml
@@ -57,6 +57,9 @@
            </if>
                AND s.del_flag = 0
        </where>
+        ORDER BY
+        COALESCE(d.latest_create_time, s.report_date) DESC,
+        s.report_date DESC
    </select>