|
|
@ -108,9 +108,9 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
|
final List<FlowProcDefDto> dataList = flowDeployMapper.selectDeployList(name);
|
|
|
|
final List<FlowProcDefDto> dataList = flowDeployMapper.selectDeployList(name);
|
|
|
|
|
|
|
|
// 加载挂表单
|
|
|
|
for (FlowProcDefDto procDef : dataList) {
|
|
|
|
for (FlowProcDefDto procDef : dataList) {
|
|
|
|
SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(procDef.getId());
|
|
|
|
SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(procDef.getDeploymentId());
|
|
|
|
if (Objects.nonNull(sysForm)) {
|
|
|
|
if (Objects.nonNull(sysForm)) {
|
|
|
|
procDef.setFormName(sysForm.getFormName());
|
|
|
|
procDef.setFormName(sysForm.getFormName());
|
|
|
|
procDef.setFormId(sysForm.getFormId());
|
|
|
|
procDef.setFormId(sysForm.getFormId());
|
|
|
|