This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 6f7543eab [Bug] jdbc like bug fixed (#3462)
6f7543eab is described below
commit 6f7543eab630252f6d376dce34263a8c7fef76a2
Author: benjobs <[email protected]>
AuthorDate: Sun Jan 7 11:28:53 2024 +0800
[Bug] jdbc like bug fixed (#3462)
Co-authored-by: benjobs <[email protected]>
---
.../src/main/resources/mapper/core/ApplicationMapper.xml | 6 +++---
.../src/main/resources/mapper/core/ProjectMapper.xml | 2 +-
.../src/main/resources/mapper/core/VariableMapper.xml | 6 +++---
.../src/main/resources/mapper/core/YarnQueueMapper.xml | 2 +-
.../src/main/resources/mapper/system/MemberMapper.xml | 2 +-
.../src/main/resources/mapper/system/RoleMapper.xml | 2 +-
.../src/main/resources/mapper/system/TeamMapper.xml | 2 +-
.../src/main/resources/mapper/system/UserMapper.xml | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
index e2674ecef..ebc1a275e 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
@@ -163,10 +163,10 @@
and t.execution_mode = #{application.executionMode}
</if>
<if test="application.jobName != null and application.jobName !=
''">
- and t.job_name like concat('%',#{application.jobName},'%')
+ and t.job_name like concat('%','${application.jobName}','%')
</if>
<if test="application.projectName != null and
application.projectName != ''">
- and p.name like concat('%',#{application.projectName},'%')
+ and p.name like concat('%','${application.projectName}','%')
</if>
<if test="application.appId != null and application.appId != ''">
and t.app_id = #{application.appId}
@@ -185,7 +185,7 @@
</foreach>
</if>
<if test="application.tags != null and application.tags != ''">
- and t.tags like concat('%',#{application.tags},'%')
+ and t.tags like concat('%','${application.tags}','%')
</if>
</where>
</select>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml
index 0402ba7c8..a04ab7305 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/ProjectMapper.xml
@@ -72,7 +72,7 @@
<where>
t.team_id = #{project.teamId}
<if test="project.name != null and project.name != ''">
- and t.name like concat('%',#{project.name},'%')
+ and t.name like concat('%','${project.name}','%')
</if>
<if test="project.buildState != null">
and t.build_state = #{project.buildState}
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
index fca40a20e..855ec164c 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/VariableMapper.xml
@@ -38,10 +38,10 @@
on v.creator_id = u.user_id
and v.team_id = #{variable.teamId}
<if test="variable.description != null and variable.description != ''">
- and v.description like concat('%',#{variable.description},'%')
+ and v.description like concat('%','${variable.description}','%')
</if>
<if test="variable.variableCode != null and variable.variableCode !=
''">
- and v.variable_code like concat('%',#{variable.variableCode},'%')
+ and v.variable_code like concat('%','${variable.variableCode}','%')
</if>
</select>
@@ -61,7 +61,7 @@
<where>
team_id = #{teamId}
<if test="keyword != null and keyword != ''">
- and variable_code like concat('%', #{keyword}, '%') or
description like concat('%', #{keyword}, '%')
+ and variable_code like concat('%', '${keyword}', '%') or
description like concat('%', '${keyword}', '%')
</if>
</where>
</select>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
index f21e1b76a..a1f27f4a8 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/YarnQueueMapper.xml
@@ -33,7 +33,7 @@
team_id = #{yarnQueue.teamId}
</if>
<if test="yarnQueue.queueLabel != null and yarnQueue.queueLabel !=
''">
- and queue_label like concat('%',#{yarnQueue.queueLabel},'%')
+ and queue_label like concat('%','${yarnQueue.queueLabel}','%')
</if>
<if test="yarnQueue.createTimeFrom != null and
yarnQueue.createTimeFrom !=''">
and create_time > #{yarnQueue.createTimeFrom}
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
index 21fa87363..3d79db840 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
@@ -51,7 +51,7 @@
<where>
tur.team_id = #{member.teamId}
<if test="member.userName != null and member.userName != ''">
- and u.username like concat('%',#{member.userName},'%')
+ and u.username like concat('%','${member.userName}','%')
</if>
<if test="member.roleName != null and member.roleName != ''">
and r.role_name = #{member.roleName}
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
index f0850066c..c4c2bcaff 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
@@ -29,7 +29,7 @@
select * from t_role
<where>
<if test="role.roleName != null and role.roleName != ''">
- and role_name like concat('%',#{role.roleName},'%')
+ and role_name like concat('%','${role.roleName}','%')
</if>
<if test="role.createTimeFrom != null and role.createTimeFrom
!=''">
and create_time > #{role.createTimeFrom}
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
index e4bd10dd3..328842435 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
@@ -29,7 +29,7 @@
select * from t_team
<where>
<if test="team.teamName != null and team.teamName != ''">
- and team_name like concat('%',#{team.teamName},'%')
+ and team_name like concat('%','${team.teamName}','%')
</if>
<if test="team.createTimeFrom != null and team.createTimeFrom
!=''">
and create_time > #{team.createTimeFrom}
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
index 74ff21ad6..db459d626 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
@@ -38,7 +38,7 @@
select * from t_user
<where>
<if test="user.username != null and user.username != ''">
- and username like concat('%',#{user.username},'%')
+ and username like concat('%','${user.username}','%')
</if>
<if test="user.createTimeFrom != null and user.createTimeFrom
!=''">
and create_time > #{user.createTimeFrom}
