...
|
...
|
@@ -808,13 +808,14 @@ and not ( |
|
|
and
|
|
|
task.last_stage ->>'id'<>'0'
|
|
|
)
|
|
|
and task.status = ?
|
|
|
`
|
|
|
|
|
|
relatedUser := fmt.Sprintf("[%d]", relatedUserId)
|
|
|
if len(leaderId) == 0 {
|
|
|
leaderId = []string{"-1"}
|
|
|
}
|
|
|
condition := []interface{}{companyId, pg.In(leaderId), relatedUser}
|
|
|
condition := []interface{}{companyId, pg.In(leaderId), relatedUser, domain.TaskRunning}
|
|
|
result := []TaskData6{}
|
|
|
tx := d.transactionContext.PgTx
|
|
|
_, err := tx.Query(&result, sqlStr, condition...)
|
...
|
...
|
|