From ffc283be535589c568ae3840b7155697f93e7843 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 2 Dec 2020 16:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E5=A4=84=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=9B=A0=E4=BA=8B=E5=8A=A1=E6=9C=AA=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=E7=9A=84bug=EF=BC=8C=E9=81=97=E7=95=99=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BB=BB=E5=8A=A1=E6=97=B6=E7=9A=84=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/flow/service/FlowService.java | 1 + .../com/lz/modules/flow/service/impl/FlowServiceImpl.java | 5 +++++ .../sys/service/app/impl/ResultRecordServiceImpl.java | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) 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()));