OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 调度任务日志多语言下查询失败

Browse Source
This commit is contained in:
TsMask
2024-01-10 14:57:33 +08:00
parent 2e2ccba765
commit b838c76a4f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/monitor/controller/sys_job_log.go
View File

@@ -41,6 +41,12 @@ type SysJobLogController struct {
func (s *SysJobLogController) List(c *gin.Context) { func (s *SysJobLogController) List(c *gin.Context) {
// 查询参数转换map // 查询参数转换map
querys := ctx.QueryMap(c) 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) data := s.sysJobLogService.SelectJobLogPage(querys)
rows := data["rows"].([]model.SysJobLog) rows := data["rows"].([]model.SysJobLog)

2
src/modules/monitor/repository/sys_job_log.impl.go
View File

@@ -59,7 +59,7 @@ func (r *SysJobLogImpl) SelectJobLogPage(query map[string]any) map[string]any {
var conditions []string var conditions []string
var params []any var params []any
if v, ok := query["jobName"]; ok && v != "" { if v, ok := query["jobName"]; ok && v != "" {
conditions = append(conditions, "job_name like concat(?, '%')") conditions = append(conditions, "job_name = ?")
params = append(params, v) params = append(params, v)
} }
if v, ok := query["jobGroup"]; ok && v != "" { if v, ok := query["jobGroup"]; ok && v != "" {