|
@@ -3398,7 +3398,7 @@ public class TaskController extends BladeController {
|
|
|
String delTask = "DELETE from u_task where form_data_id ='" + periodId + "'";
|
|
|
|
|
|
//查询出当前计量期对应的任务
|
|
|
- String selectTask = "SELECT * from u_task WHERE approval_type = 5 and form_data_id = ? and status in (1,2)";
|
|
|
+ String selectTask = "SELECT * from u_task WHERE approval_type = 5 and form_data_id = ? and is_deleted = 0 and status in (1,2)";
|
|
|
List<Task> list = jdbcTemplate.query(selectTask, new BeanPropertyRowMapper<>(Task.class), periodId);
|
|
|
if (list.size() == 0){
|
|
|
return R.fail("撤销失败:未查出当前计量期对应任务信息");
|