diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index f6e0aafd..5124fedf 100755
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -235,6 +235,7 @@
and ct.create_date=#{createDate}
and ct.update_by=#{updateBy}
and update_date=#{updateDate}
+
)ct ORDER BY ct.content_datetime desc,content_sort desc
@@ -253,10 +254,20 @@
(select id FROM cms_category where find_in_set('${categoryId}',CATEGORY_PARENT_IDS)>0))
- and content_datetime >= #{beginTime}
+
+ and content_datetime >= #{beginTime}
+
+
+ and content_datetime >= to_date(#{beginTime}, 'yyyy-mm-dd hh24:mi:ss')
+
- and content_datetime >= #{endTime}
+
+ and content_datetime >= #{endTime}
+
+
+ and content_datetime >= to_date(#{endTime}, 'yyyy-mm-dd hh24:mi:ss')
+
and ct.content_type in ( #{flag})
@@ -319,7 +330,13 @@
and a.content_details like CONCAT(CONCAT("%",#{map.content_details}),"%")
- and a.content_datetime between #{map.content_datetime_start} and #{map.content_datetime_end}
+
+ and a.content_datetime between #{map.content_datetime_start} and #{map.content_datetime_end}
+
+
+ and a.content_datetime > to_date(#{map.content_datetime_start}, 'yyyy-mm-dd hh24:mi:ss')
+ and a.content_datetime < to_date(#{map.content_datetime_end}, 'yyyy-mm-dd hh24:mi:ss')
+