Merge branch 'dev'
This commit is contained in:
commit
89b16b4ddf
|
@ -32,7 +32,6 @@ import io.renren.modules.security.user.SecurityUser;
|
||||||
import io.renren.modules.security.user.UserDetail;
|
import io.renren.modules.security.user.UserDetail;
|
||||||
import io.renren.modules.sys.dto.SysDeptDTO;
|
import io.renren.modules.sys.dto.SysDeptDTO;
|
||||||
import io.renren.modules.sys.dto.SysUserDTO;
|
import io.renren.modules.sys.dto.SysUserDTO;
|
||||||
import io.renren.modules.sys.enums.SuperAdminEnum;
|
|
||||||
import io.renren.modules.sys.service.SysDeptService;
|
import io.renren.modules.sys.service.SysDeptService;
|
||||||
import io.renren.modules.sys.service.SysUserService;
|
import io.renren.modules.sys.service.SysUserService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
@ -305,6 +304,7 @@ public class TAbilityApplicationController {
|
||||||
detailDTO.setExecutionId(task.getExecutionId());
|
detailDTO.setExecutionId(task.getExecutionId());
|
||||||
detailDTO.setProcessDefinitionId(task.getProcessDefinitionId());
|
detailDTO.setProcessDefinitionId(task.getProcessDefinitionId());
|
||||||
detailDTO.setComment("待审核");
|
detailDTO.setComment("待审核");
|
||||||
|
detailDTO.setTaskId(task.getId());
|
||||||
final List<HistoryDetailDTO> taskHandleDetailInfo_ = new ArrayList<>();
|
final List<HistoryDetailDTO> taskHandleDetailInfo_ = new ArrayList<>();
|
||||||
taskHandleDetailInfo_.add(detailDTO);
|
taskHandleDetailInfo_.add(detailDTO);
|
||||||
taskHandleDetailInfo_.addAll(taskHandleDetailInfo);
|
taskHandleDetailInfo_.addAll(taskHandleDetailInfo);
|
||||||
|
|
Loading…
Reference in New Issue