Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -885,6 +885,14 @@ public class FlowableTaskController {
         return flowTaskService.getTaskAuditUsers(taskId);
     }
 
+    @GetMapping("getTaskAuditUsersByprocInstId")
+    public  List<String> getTaskAuditUsersByprocInstId(String procInsId) {
+        return flowTaskService.getTaskAuditUsersByprocInstId(procInsId);
+    }
+
+
+
+
     @GetMapping("getCurrentTaskName")
     public String getCurrentTaskName(String processInstanceId) {
         return flowTaskService.getCurrentTaskName(processInstanceId);
@@ -1011,6 +1019,9 @@ public class FlowableTaskController {
         return flowTaskService.getTaskIdByprocInstId(procInsId);
     }
 
+
+
+
     /**
      * 获取当前节点信息
      *

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/FlowMapper.java

@@ -9,6 +9,8 @@ import com.jeeplus.flowable.model.ActRuTaskInfo;
 import com.jeeplus.flowable.model.Flow;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 审批Mapper接口
  *
@@ -19,6 +21,8 @@ public interface FlowMapper extends BaseMapper <Flow> {
 
     String getTaskIdByprocInstId(String procInsId);
 
+    String getTaskAuditUsersByprocInstId(String procInsId);
+
     @InterceptorIgnore(tenantLine = "true")
     int updateProcInsIdByBusinessId(Flow act);
 

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/xml/FlowMapper.xml

@@ -14,6 +14,10 @@
         select ID_ from act_hi_procinst where PROC_INST_ID_ = #{procInstId}
     </select>
 
+	<select id="getTaskAuditUsersByprocInstId" resultType="java.lang.String">
+		select ID_ from act_ru_task where PROC_INST_ID_ = #{procInstId}
+	</select>
+
     <select id="getTaskInfoByTaskId" resultType="com.jeeplus.flowable.model.ActRuTaskInfo">
 		select
 		  ID_ as "id",

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -347,6 +347,16 @@ public class FlowTaskService {
         return flowMapper.getTaskIdByprocInstId(procInsId);
     }
 
+    public List<String> getTaskAuditUsersByprocInstId(String procInsId){
+       String taskId = flowMapper.getTaskAuditUsersByprocInstId(procInsId);
+        List<String> assignList = Lists.newArrayList ();
+        //获取当前节点审核人id信息集合
+        taskService.getIdentityLinksForTask ( taskId ).forEach ( identityLink -> {
+            assignList.add ( identityLink.getUserId () );
+        } );
+        return assignList;
+    }
+
     /**
      * 获取待办任务列表
      *