From b838c76a4f704862f7ef643d3dfd44c6ad9571dc Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 10 Jan 2024 14:57:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=B8=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/monitor/controller/sys_job_log.go      | 6 ++++++
 src/modules/monitor/repository/sys_job_log.impl.go | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/monitor/controller/sys_job_log.go b/src/modules/monitor/controller/sys_job_log.go
index 85a8a823..f84bc869 100644
--- a/src/modules/monitor/controller/sys_job_log.go
+++ b/src/modules/monitor/controller/sys_job_log.go
@@ -41,6 +41,12 @@ type SysJobLogController struct {
 func (s *SysJobLogController) List(c *gin.Context) {
 	// 查询参数转换map
 	querys := ctx.QueryMap(c)
+	// 任务ID优先级更高
+	if v, ok := querys["jobId"]; ok && v != nil {
+		jobInfo := service.NewSysJobImpl.SelectJobById(v.(string))
+		querys["jobName"] = jobInfo.JobName
+		querys["jobGroup"] = jobInfo.JobGroup
+	}
 	data := s.sysJobLogService.SelectJobLogPage(querys)
 
 	rows := data["rows"].([]model.SysJobLog)
diff --git a/src/modules/monitor/repository/sys_job_log.impl.go b/src/modules/monitor/repository/sys_job_log.impl.go
index cf506c4d..2e97e85b 100644
--- a/src/modules/monitor/repository/sys_job_log.impl.go
+++ b/src/modules/monitor/repository/sys_job_log.impl.go
@@ -59,7 +59,7 @@ func (r *SysJobLogImpl) SelectJobLogPage(query map[string]any) map[string]any {
 	var conditions []string
 	var params []any
 	if v, ok := query["jobName"]; ok && v != "" {
-		conditions = append(conditions, "job_name like concat(?, '%')")
+		conditions = append(conditions, "job_name = ?")
 		params = append(params, v)
 	}
 	if v, ok := query["jobGroup"]; ok && v != "" {