From 965f52aac8b98283d4e50933059a19c1d74bdebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=90=9B=E9=B9=8F?= <2812689217@qq.com>
Date: Mon, 17 Aug 2020 17:29:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E6=8E=92=E5=BA=8F=E7=9A=84=E5=80=92?=
 =?UTF-8?q?=E5=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/dao/IContentDao.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 25fef61f..a43682d1 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -185,7 +185,9 @@
 		</select>
 	<!--条件查询-->
 	<select id="query" resultMap="resultMap">
-		select ct.* from cms_content ct join cms_category cc on ct.content_category_id=cc.id
+		select ct.* from (
+		select ct.* from cms_content ct
+		join cms_category cc on ct.content_category_id=cc.id
 		<where>
 			<if test="contentTitle != null and contentTitle != ''"> and  content_title like CONCAT('%',#{contentTitle},'%')</if>
 			<if test="contentCategoryId != null and contentCategoryId != ''"> and content_category_id=#{contentCategoryId}</if>
@@ -209,7 +211,7 @@
 			<if test="del != null"> and ct.del=#{del} </if>
 			<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>
 		</where>
-		order by id desc
+		)ct ORDER BY date_format(ct.content_datetime,'%Y-%m-%d') desc,content_sort desc
 	</select>
 
 	<sql id="queryWhereCategoryId" databaseId="mysql">
-- 
Gitee