diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 0321f9eb7..cc81b6a59 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -316,14 +316,18 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi // if num >= AcceptMaxCount { // return 0, errCode, fmt.Errorf("每人最多接取" + utils.Int2Str(AcceptMaxCount) + "个任务,请核实!") // } - num, err = checkJobOrders(db, jobID, "<= "+utils.Int2Str(model.JobOrderStatusWaitAudit), userID, utils.ZeroTimeValue, utils.ZeroTimeValue) - if num > 0 { - return 0, errCode, fmt.Errorf("您还有此任务未完成,请完成后再接取!") - } - num, err = checkJobOrders(db, jobID, "= "+utils.Int2Str(model.JobOrderStatusAuditUnPass), userID, utils.ZeroTimeValue, utils.ZeroTimeValue) - if num > 0 { - return 0, errCode, fmt.Errorf("您还有此任务未审核通过记录,可直接在未审核中重新提交!") + //非快递任务 + if jobID != 2 { + num, err = checkJobOrders(db, jobID, "<= "+utils.Int2Str(model.JobOrderStatusWaitAudit), userID, utils.ZeroTimeValue, utils.ZeroTimeValue) + if num > 0 { + return 0, errCode, fmt.Errorf("您还有此任务未完成,请完成后再接取!") + } + num, err = checkJobOrders(db, jobID, "= "+utils.Int2Str(model.JobOrderStatusAuditUnPass), userID, utils.ZeroTimeValue, utils.ZeroTimeValue) + if num > 0 { + return 0, errCode, fmt.Errorf("您还有此任务未审核通过记录,可直接在未审核中重新提交!") + } } + switch job.LimitCountType { case model.JobLimitCountTypePO: num, err = checkJobOrders(db, jobID, "<> "+utils.Int2Str(model.JobOrderStatusCancel), userID, utils.ZeroTimeValue, utils.ZeroTimeValue)