From 193d144a04697470f8e26c6848702572e5ce4d08 Mon Sep 17 00:00:00 2001
From: xierz <aa134321192@163.com>
Date: Wed, 16 Dec 2020 16:00:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=80=82=E9=85=8Doracle=202=E3=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=A9=BA=E9=97=B4=EF=BC=8C=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E6=97=B6=E9=97=B4=E6=97=A5=E6=9C=9F=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/mingsoft/cms/dao/IContentDao.xml | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

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 @@
 			<if test="createDate != null"> and ct.create_date=#{createDate} </if>
 			<if test="updateBy &gt; 0"> and ct.update_by=#{updateBy} </if>
 			<if test="updateDate != null"> and update_date=#{updateDate} </if>
+			<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>
 		</where>
 		)ct ORDER BY ct.content_datetime desc,content_sort desc
 	</select>
@@ -253,10 +254,20 @@
 				(select id FROM cms_category where find_in_set('${categoryId}',CATEGORY_PARENT_IDS)>0))
 			</if>
 			<if test="beginTime!=null and beginTime!=''">
-				and content_datetime &gt;= #{beginTime}
+				<if test="_databaseId == 'mysql'">
+					and content_datetime &gt;= #{beginTime}
+				</if>
+				<if test="_databaseId == 'oracle'">
+					and content_datetime &gt;= to_date(#{beginTime}, 'yyyy-mm-dd hh24:mi:ss')
+				</if>
 			</if>
 			<if test="endTime!=null and endTime!=''">
-				and content_datetime &gt;= #{endTime}
+				<if test="_databaseId == 'mysql'">
+					and content_datetime &gt;= #{endTime}
+				</if>
+				<if test="_databaseId == 'oracle'">
+					and content_datetime &gt;= to_date(#{endTime}, 'yyyy-mm-dd hh24:mi:ss')
+				</if>
 			</if>
 			<if test="flag!=null and flag!=''">
 			and ct.content_type in ( #{flag})
@@ -319,7 +330,13 @@
 			and a.content_details like CONCAT(CONCAT("%",#{map.content_details}),"%")
 			</if>
 			<if test="map.content_datetime_start!=null and map.content_datetime_end!=null">
-				and a.content_datetime between #{map.content_datetime_start} and #{map.content_datetime_end}
+				<if test="_databaseId == 'mysql'">
+					and a.content_datetime between #{map.content_datetime_start} and #{map.content_datetime_end}
+				</if>
+				<if test="_databaseId == 'oracle'">
+					and a.content_datetime &gt; to_date(#{map.content_datetime_start}, 'yyyy-mm-dd hh24:mi:ss')
+					and a.content_datetime &lt; to_date(#{map.content_datetime_end}, 'yyyy-mm-dd hh24:mi:ss')
+				</if>
 			</if>
 			<if test="tableName!=null and tableName!='' and diyMap!=null">
 				<foreach item="item" index="index" collection="diyList" open=""