Compare commits

..

No commits in common. "1ea55bd39a5c67a1c11a0838a02b246614ce1ecf" and "4af20b8551602a3067a2cd99d50629722090fe26" have entirely different histories.

2 changed files with 1 additions and 6 deletions

View File

@ -88,7 +88,7 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
//如果是多步骤任务且不是第一步,移除对象
if (byId.getIsAuto()==1){
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getById(byId.getAutoExeTaskId());
if (!byId.getTaskId().equals(autoExeTask.getFTaskId())){
if (!byId.getId().equals(autoExeTask.getFTaskId())){
iterator.remove();
}
}

View File

@ -138,9 +138,4 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo {
*/
@TableField("auto_exe_task_id")
private Long autoExeTaskId;
/**
* currid
*/
@TableField("auto_exe_task_id")
private Long taskId;
}