From 865858c80ce0c8762ea6a67ca1e2c2784846dcee Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 12 Nov 2020 13:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java  | 1 +
 .../java/com/lz/modules/flow/service/FlowChartService.java  | 2 ++
 .../lz/modules/flow/service/impl/FlowChartServiceImpl.java  | 6 ++++++
 .../modules/performance/controller/FlowChartController.java | 4 ++--
 src/main/resources/mapper/flow/FlowChartMapper.xml          | 6 ++++++
 5 files changed, 17 insertions(+), 2 deletions(-)

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<FlowChart> {
 
     List<FlowChart> selectFlowChartsByGroupId(Long groupId);
 
+    List<FlowChartRoleDto> 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<FlowChart> {
 	List<FlowChartDto> selectFlowChartDtoByFlowManagerId(Long id);
 
     List<FlowChart> selectFlowChartsByGroupId(Long groupId);
+
+    List<FlowChartRoleDto> 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<FlowChartMapper, FlowChart
 		return flowChartMapper.selectFlowChartsByGroupId(groupId);
 	}
 
+	@Override
+	public List<FlowChartRoleDto> 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<FlowChartDto> flowChartDtos = flowChartService.selectFlowChartDtoByFlowManagerId(flowManager.getId());
             for (FlowChartDto dto:flowChartDtos
                  ) {
-                List<FlowChartRoleDto> flowCharts = flowChartService.selectChartRoleByChartId(dto.getId());
-                dto.setRoleDtos(flowCharts);
+                List<FlowChartRoleDto> 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
     </select>
 
+    <select id="selectCanSetChartRoleByChartId" resultType="com.lz.modules.flow.model.FlowChartRoleDto" >
+        SELECT crole.id as id, crole.chart_id as chart_id, crole.role_id as role_id, role.name as role_name,
+        crole.type as type FROM lz_flow_chart_role crole left join lz_record_role role on role.id=crole.role_id
+        where crole.chart_id=#{id} and crole.type = 0
+    </select>
+
 </mapper>