Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xuxueli merged 2 commits into from
Apr 5, 2026
+10 −10
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49c3261
fix(mapper): 修复XML映射文件中的条件拼接潜在语法错误的问题
Mar 26, 2026
5319b5b
Merge branch 'master' into master
izhangzhiqing Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions xxl-job-admin/src/main/resources/mapper/XxlJobGroupMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions xxl-job-admin/src/main/resources/mapper/XxlJobInfoMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions xxl-job-admin/src/main/resources/mapper/XxlJobLogMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions xxl-job-admin/src/main/resources/mapper/XxlJobUserMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading