diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go index 17a0189a2..f6b6852f6 100644 --- a/business/model/dao/dao_job.go +++ b/business/model/dao/dao_job.go @@ -285,7 +285,7 @@ type GetJobOrdersResult struct { Content string `orm:"size(500)" json:"content"` } -func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID string, statusCompareStr string, fromTime, toTime time.Time, statuss []int, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { +func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID, jobUserID string, statusCompareStr string, fromTime, toTime time.Time, statuss []int, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { var jobOrders []*GetJobOrdersResult sql := ` SELECT SQL_CALC_FOUND_ROWS a.*, b.job_limit_at, b.vendor_id, b.avg_price, b.title, b.content @@ -306,6 +306,10 @@ func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID string, statusC sql += ` AND a.user_id = ?` sqlParams = append(sqlParams, userID) } + if jobUserID != "" { + sql += ` AND b.user_id = ?` + sqlParams = append(sqlParams, jobUserID) + } if statusCompareStr != "" { sql += ` AND a.status ` + statusCompareStr } diff --git a/controllers/job_controller.go b/controllers/job_controller.go index a24ebdc5e..36e5add1e 100644 --- a/controllers/job_controller.go +++ b/controllers/job_controller.go @@ -138,6 +138,7 @@ func (c *JobController) CancelAcceptJob() { // @Description 查看接受的任务列表 // @Param token header string true "认证token" // @Param userID query string false "用户ID" +// @Param jobUserID query string false "发起任务的用户ID" // @Param categoryID query string false "分类ID" // @Param statuss query string false "状态s" // @Param fromTime query string false "开始时间" @@ -153,7 +154,7 @@ func (c *JobController) GetJobOrders() { statuss []int ) if err = jxutils.Strings2Objs(params.Statuss, &statuss); err == nil { - retVal, err = dao.GetJobOrders(dao.GetDB(), 0, 0, params.UserID, "", utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime), statuss, params.PageSize, params.Offset) + retVal, err = dao.GetJobOrders(dao.GetDB(), 0, 0, params.UserID, params.JobUserID, "", utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime), statuss, params.PageSize, params.Offset) } return retVal, "", err })