From cc9f77995775ef1b6418318753fb54c4a4a91dc7 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 27 Dec 2023 17:29:29 +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=E6=9F=A5=E8=AF=A2=E9=87=8D=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/monitor/controller/sys_job_log.go  | 18 +-----------------
 src/modules/monitor/repository/sys_job.impl.go | 16 ++++------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/modules/monitor/controller/sys_job_log.go b/src/modules/monitor/controller/sys_job_log.go
index 6223f884..85a8a823 100644
--- a/src/modules/monitor/controller/sys_job_log.go
+++ b/src/modules/monitor/controller/sys_job_log.go
@@ -43,25 +43,9 @@ func (s *SysJobLogController) List(c *gin.Context) {
 	querys := ctx.QueryMap(c)
 	data := s.sysJobLogService.SelectJobLogPage(querys)
 
-	language := ctx.AcceptLanguage(c)
-
-	// 反查多语言key
-	if v, ok := querys["jobName"]; ok && v != "" {
-		querys["jobName"] = i18n.ValueKey(language, querys["jobName"].(string))
-	}
-
-	dataI18n := s.sysJobLogService.SelectJobLogPage(querys)
-	totalI18n := parse.Number(dataI18n["total"])
-	if totalI18n != 0 {
-		rows := data["rows"].([]model.SysJobLog)
-		total := parse.Number(data["total"])
-		rowsI18n := dataI18n["rows"].([]model.SysJobLog)
-		data["rows"] = append(rows, rowsI18n...)
-		data["total"] = total + totalI18n
-	}
-
 	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)
diff --git a/src/modules/monitor/repository/sys_job.impl.go b/src/modules/monitor/repository/sys_job.impl.go
index 19040fab..196601fb 100644
--- a/src/modules/monitor/repository/sys_job.impl.go
+++ b/src/modules/monitor/repository/sys_job.impl.go
@@ -234,9 +234,7 @@ func (r *SysJobImpl) InsertJob(sysJob model.SysJob) string {
 	if sysJob.InvokeTarget != "" {
 		params["invoke_target"] = sysJob.InvokeTarget
 	}
-	if sysJob.TargetParams != "" {
-		params["target_params"] = sysJob.TargetParams
-	}
+	params["target_params"] = sysJob.TargetParams
 	if sysJob.CronExpression != "" {
 		params["cron_expression"] = sysJob.CronExpression
 	}
@@ -252,9 +250,7 @@ func (r *SysJobImpl) InsertJob(sysJob model.SysJob) string {
 	if sysJob.SaveLog != "" {
 		params["save_log"] = sysJob.SaveLog
 	}
-	if sysJob.Remark != "" {
-		params["remark"] = sysJob.Remark
-	}
+	params["remark"] = sysJob.Remark
 	if sysJob.CreateBy != "" {
 		params["create_by"] = sysJob.CreateBy
 		params["create_time"] = time.Now().UnixMilli()
@@ -300,9 +296,7 @@ func (r *SysJobImpl) UpdateJob(sysJob model.SysJob) int64 {
 	if sysJob.InvokeTarget != "" {
 		params["invoke_target"] = sysJob.InvokeTarget
 	}
-	if sysJob.TargetParams != "" {
-		params["target_params"] = sysJob.TargetParams
-	}
+	params["target_params"] = sysJob.TargetParams
 	if sysJob.CronExpression != "" {
 		params["cron_expression"] = sysJob.CronExpression
 	}
@@ -318,9 +312,7 @@ func (r *SysJobImpl) UpdateJob(sysJob model.SysJob) int64 {
 	if sysJob.SaveLog != "" {
 		params["save_log"] = sysJob.SaveLog
 	}
-	if sysJob.Remark != "" {
-		params["remark"] = sysJob.Remark
-	}
+	params["remark"] = sysJob.Remark
 	if sysJob.UpdateBy != "" {
 		params["update_by"] = sysJob.UpdateBy
 		params["update_time"] = time.Now().UnixMilli()