Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions datavines-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,14 @@
<artifactId>slf4j-reload4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>javax.servlet</artifactId>
<groupId>org.eclipse.jetty.orbit</groupId>
</exclusion>
<exclusion>
<artifactId>servlet-api-2.5</artifactId>
<groupId>org.mortbay.jetty</groupId>
</exclusion>
</exclusions>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion datavines-server/src/main/resources/mapper/JobMapper.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<select id="getJobPageSelect" resultType="io.datavines.server.api.dto.vo.JobVO">
select p.id, p.name, p.schema_name ,p.table_name,p.column_name, p.type, u.username as updater, p.update_time, s.cron_expression
from (<include refid="basic_sql"/>) p left join `dv_user` u on u.id = p.create_by
from (<include refid="basic_sql"/>) p left join `dv_user` u on u.id = p.update_by
left join `dv_job_schedule` s on p.id = s.job_id and s.status = 1
<where>
<if test="searchVal != null and searchVal != ''">
Expand Down
Loading