Merge pull request #3939 from izhangzhiqing/master

修复在使用MyBatis的trim标签生成动态SQL时潜在的语法错误

xxl-job-admin/src/main/resources/mapper/XxlJobGroupMapper.xml

@@ -63,7 +63,7 @@
 	<select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobGroup">
 		SELECT <include refid="Base_Column_List" />
 		FROM xxl_job_group AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="appname != null and appname != ''">
 				AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%')
 			</if>
@@ -78,7 +78,7 @@
 	<select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
 		SELECT count(1)
 		FROM xxl_job_group AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="appname != null and appname != ''">
 				AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%')
 			</if>

xxl-job-admin/src/main/resources/mapper/XxlJobInfoMapper.xml

@@ -68,7 +68,7 @@
 	<select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
 		SELECT <include refid="Base_Column_List" />
 		FROM xxl_job_info AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="jobGroup gt 0">
 				AND t.job_group = #{jobGroup}
 			</if>
@@ -92,7 +92,7 @@
 	<select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
 		SELECT count(1)
 		FROM xxl_job_info AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="jobGroup gt 0">
 				AND t.job_group = #{jobGroup}
 			</if>

xxl-job-admin/src/main/resources/mapper/XxlJobLogMapper.xml

@@ -47,7 +47,7 @@
 	<select id="pageList" resultMap="XxlJobLog">
 		SELECT <include refid="Base_Column_List" />
 		FROM xxl_job_log AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="jobGroup gt 0">
 				AND t.job_group = #{jobGroup}
 			</if>
@@ -81,7 +81,7 @@
 	<select id="pageListCount" resultType="int">
 		SELECT count(1)
 		FROM xxl_job_log AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="jobGroup gt 0">
 				AND t.job_group = #{jobGroup}
 			</if>
@@ -187,7 +187,7 @@
 
 	<select id="findClearLogIds" resultType="long" >
 		SELECT id FROM xxl_job_log
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="jobGroup gt 0">
 				AND job_group = #{jobGroup}
 			</if>
@@ -201,7 +201,7 @@
 				AND id NOT in(
 				SELECT id FROM(
 				SELECT id FROM xxl_job_log AS t
-				<trim prefix="WHERE" prefixOverrides="AND | OR" >
+				<trim prefix="WHERE" prefixOverrides="AND |OR " >
 					<if test="jobGroup gt 0">
 						AND t.job_group = #{jobGroup}
 					</if>

xxl-job-admin/src/main/resources/mapper/XxlJobUserMapper.xml

@@ -24,7 +24,7 @@
 	<select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobUser">
 		SELECT <include refid="Base_Column_List" />
 		FROM xxl_job_user AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="username != null and username != ''">
 				AND t.username like CONCAT(CONCAT('%', #{username}), '%')
 			</if>
@@ -39,7 +39,7 @@
 	<select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
 		SELECT count(1)
 		FROM xxl_job_user AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR" >
+		<trim prefix="WHERE" prefixOverrides="AND |OR " >
 			<if test="username != null and username != ''">
 				AND t.username like CONCAT(CONCAT('%', #{username}), '%')
 			</if>