|
...
|
...
|
@@ -39,7 +39,7 @@ func (d *SummaryEvaluationDao) GetExecutorCycleList(companyId int, executorId in |
|
|
|
summary_evaluation.cycle_id ,
|
|
|
|
summary_evaluation.cycle_name
|
|
|
|
from summary_evaluation
|
|
|
|
where summary_evaluation.company_id=?
|
|
|
|
where summary_evaluation.company_id=? and summary_evaluation.deleted_at isnull
|
|
|
|
`
|
|
|
|
tx := d.transactionContext.PgTx
|
|
|
|
condition := []interface{}{
|
|
...
|
...
|
@@ -64,7 +64,7 @@ func (d *SummaryEvaluationDao) CountExecutorCycleList(companyId int, executorId |
|
|
|
distinct summary_evaluation.cycle_id
|
|
|
|
) as cnt
|
|
|
|
from summary_evaluation
|
|
|
|
where summary_evaluation.company_id=? `
|
|
|
|
where summary_evaluation.company_id=? and summary_evaluation.deleted_at isnull `
|
|
|
|
|
|
|
|
tx := d.transactionContext.PgTx
|
|
|
|
condition := []interface{}{
|
...
|
...
|
|
