diff --git a/src/main/java/com/lz/modules/flow/service/FlowService.java b/src/main/java/com/lz/modules/flow/service/FlowService.java index 37f43fea..abd795f2 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowService.java @@ -38,4 +38,5 @@ public interface FlowService extends IService { FlowChart selectFlowChartByChartId(Long flowId); + FlowChart selectFlowChartByFlow(Flow flow); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java index 18161ddb..636325c8 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java @@ -77,6 +77,11 @@ public class FlowServiceImpl extends ServiceImpl implements Fl return flowChart; } + @Override + public FlowChart selectFlowChartByFlow(Flow flow){ + FlowChart flowChart = flowChartService.selectFlowChartById(flow.getChartId()); + return flowChart; + } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 5c262109..35657713 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -841,10 +841,11 @@ public class ResultRecordServiceImpl extends ServiceImpl flows,FlowApprovalRole flowApprovalRole ,ResultRecord resultRecord,int i,Integer stepType ){ flowRecord.setApprovalStaffName(approvalStaff.getName()); flowRecord.setApprovalStaffId(approvalStaff.getId()); - flowRecord.setFlowName(getFlow(flows, flowApprovalRole.getFlowId()).getOptDesc()); + Flow flow = getFlow(flows, flowApprovalRole.getFlowId()); + flowRecord.setFlowName(flow.getOptDesc()); flowRecord.setRecordStaffId(resultRecord.getStaffId()); flowRecord.setFlowId(flowApprovalRole.getFlowId()); - FlowChart flowChart = flowService.selectFlowChartByChartId(flowApprovalRole.getFlowId()); + FlowChart flowChart = flowService.selectFlowChartByFlow(flow); flowRecord.setProcessId(flowChart.getProcessId()); flowRecord.setFlowProcess(flowChart.getFlowProcess()); String staffRole = StaffRoles.getStaffRole(approvalStaff.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId()));