diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java index 4dbb61ea..110deb97 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java @@ -43,4 +43,5 @@ public interface FlowChartMapper extends BaseMapper { List selectFlowChartsByGroupId(Long groupId); + List selectCanSetChartRoleByChartId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartService.java b/src/main/java/com/lz/modules/flow/service/FlowChartService.java index c3a3e84a..7ad4b0ab 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowChartService.java @@ -41,4 +41,6 @@ public interface FlowChartService extends IService { List selectFlowChartDtoByFlowManagerId(Long id); List selectFlowChartsByGroupId(Long groupId); + + List selectCanSetChartRoleByChartId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java index 57865106..d3539334 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java @@ -82,6 +82,12 @@ public class FlowChartServiceImpl extends ServiceImpl selectCanSetChartRoleByChartId(Long id) + { + return flowChartMapper.selectCanSetChartRoleByChartId(id); + } + } diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 2f066aba..063e2980 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -57,8 +57,8 @@ public class FlowChartController { List flowChartDtos = flowChartService.selectFlowChartDtoByFlowManagerId(flowManager.getId()); for (FlowChartDto dto:flowChartDtos ) { - List flowCharts = flowChartService.selectChartRoleByChartId(dto.getId()); - dto.setRoleDtos(flowCharts); + List flowChartRoles = flowChartService.selectCanSetChartRoleByChartId(dto.getId()); + dto.setRoleDtos(flowChartRoles); if(groupId > 0){ //获取节点已保存的数据 FlowChartDetailRecordListDto flowChartDetailRecordListDto = new FlowChartDetailRecordListDto(); diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml index 7cf2e556..948bfa61 100644 --- a/src/main/resources/mapper/flow/FlowChartMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartMapper.xml @@ -119,5 +119,11 @@ ) and is_delete=0 order by step_index asc + +