From e7b0669ba01fec3623622a6a6da26b8017f0bc4f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 18:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml
index 7b905a4..d457ead 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml
@@ -74,7 +74,12 @@
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
- ORDER BY create_time DESC
+ <if test="query.liveStatus == null">
+ ORDER BY start_time
+ </if>
+ <if test="query.liveStatus != null">
+ ORDER BY create_time DESC
+ </if>
</select>
</mapper>
--
Gitblit v1.7.1