From 8b01661392d82589501196de9ba6c8d61d4a9101 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 15 Apr 2024 14:49:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E5=A4=9A=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=8F=8D=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/monitor/controller/sys_job.go     | 15 ++++++++++-----
 src/modules/monitor/controller/sys_job_log.go |  9 +++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/modules/monitor/controller/sys_job.go b/src/modules/monitor/controller/sys_job.go
index 4847eeb7..9341dce9 100644
--- a/src/modules/monitor/controller/sys_job.go
+++ b/src/modules/monitor/controller/sys_job.go
@@ -40,12 +40,17 @@ type SysJobController struct {
 //
 // GET /list
 func (s *SysJobController) List(c *gin.Context) {
-	querys := ctx.QueryMap(c)
-	data := s.sysJobService.SelectJobPage(querys)
-
-	rows := data["rows"].([]model.SysJob)
-	// 闭包函数处理多语言
 	language := ctx.AcceptLanguage(c)
+	querys := ctx.QueryMap(c)
+	// 多语言值转key查询
+	if v, ok := querys["jobName"]; ok && v != "" {
+		querys["jobName"] = i18n.TFindKeyPrefix(language, "job", v.(string))
+	}
+
+	data := s.sysJobService.SelectJobPage(querys)
+	rows := data["rows"].([]model.SysJob)
+
+	// 闭包函数处理多语言
 	converI18n := func(language string, arr *[]model.SysJob) {
 		for i := range *arr {
 			(*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName)
diff --git a/src/modules/monitor/controller/sys_job_log.go b/src/modules/monitor/controller/sys_job_log.go
index b3693aff..8c6737db 100644
--- a/src/modules/monitor/controller/sys_job_log.go
+++ b/src/modules/monitor/controller/sys_job_log.go
@@ -39,6 +39,7 @@ type SysJobLogController struct {
 //
 // GET /list
 func (s *SysJobLogController) List(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
 	// 查询参数转换map
 	querys := ctx.QueryMap(c)
 	// 任务ID优先级更高
@@ -47,11 +48,15 @@ func (s *SysJobLogController) List(c *gin.Context) {
 		querys["jobName"] = jobInfo.JobName
 		querys["jobGroup"] = jobInfo.JobGroup
 	}
-	data := s.sysJobLogService.SelectJobLogPage(querys)
+	// 多语言值转key查询
+	if v, ok := querys["jobName"]; ok && v != "" {
+		querys["jobName"] = i18n.TFindKeyPrefix(language, "job", v.(string))
+	}
 
+	data := s.sysJobLogService.SelectJobLogPage(querys)
 	rows := data["rows"].([]model.SysJobLog)
+
 	// 闭包函数处理多语言
-	language := ctx.AcceptLanguage(c)
 	converI18n := func(language string, arr *[]model.SysJobLog) {
 		for i := range *arr {
 			(*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName)