Browse Source

Merge pull request '任务列表新增id筛选' (#533) from zhangweiii/pcm-coordinator:master into master

pull/534/head
zhangweiii 3 months ago
parent
commit
dadadd25f9
2 changed files with 4 additions and 1 deletions
  1. +3
    -1
      internal/logic/core/pagelisttasklogic.go
  2. +1
    -0
      internal/types/types.go

+ 3
- 1
internal/logic/core/pagelisttasklogic.go View File

@@ -42,7 +42,9 @@ func (l *PageListTaskLogic) PageListTask(req *types.PageTaskReq) (resp *types.Pa
if req.UserName != "" && req.UserName != "admin" { if req.UserName != "" && req.UserName != "admin" {
db = db.Where("user_id = ?", req.UserId) db = db.Where("user_id = ?", req.UserId)
} }

if req.Id != "" {
db = db.Where("id = ?", req.Id)
}
db = db.Where("deleted_at is null") db = db.Where("deleted_at is null")
if req.Name != "" { if req.Name != "" {
db = db.Where("name LIKE ?", "%"+req.Name+"%") db = db.Where("name LIKE ?", "%"+req.Name+"%")


+ 1
- 0
internal/types/types.go View File

@@ -6443,6 +6443,7 @@ type NodesLoadTopResp struct {
} }


type PageTaskReq struct { type PageTaskReq struct {
Id string `form:"id,optional"`
UserId int64 `form:"userId,optional"` UserId int64 `form:"userId,optional"`
Name string `form:"name,optional"` Name string `form:"name,optional"`
Type string `form:"type,optional"` Type string `form:"type,optional"`


Loading…
Cancel
Save