diff --git a/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp index a7d4558..693d2f2 100644 --- a/DataBaseLMS/databaselms.cpp +++ b/DataBaseLMS/databaselms.cpp @@ -934,9 +934,8 @@ int DataBaseLMS::deleteTrainee(int id_trainee) //Удаление задач FIM /*Выборка задач FIM для этого обучаемого*/ - queryStr = QString("SELECT tasks_fim.task_id, tasks_fim.title, " - "trainees.trainee_id " - "FROM public.tasks_fim JOIN public.trainees ON trainees.trainee_id = tasks_fim.trainee_task " + queryStr = QString("SELECT tasks_fim.task_id " + "FROM public.tasks_fim " "WHERE tasks_fim.trainee_task = %1 " "ORDER BY tasks_fim.task_id ASC").arg( id_trainee); @@ -949,7 +948,8 @@ int DataBaseLMS::deleteTrainee(int id_trainee) queryStr = QString("DELETE FROM public.malfunctions " "WHERE malfunctions.task_fim_malf = %1 ").arg( query.value(0).toInt()); - if(!queryExec(queryStr, &query)) + QSqlQuery queryDel = QSqlQuery(*db); + if(!queryExec(queryStr, &queryDel)) { resBool = db->rollback(); return 0;