Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

operation_manager/src/main/java/com/huaxu/process/service/impl/WorkFlowServiceImpl.java

@@ -402,7 +402,7 @@ public class WorkFlowServiceImpl implements WorkFlowService {
                     else{
                         isAssignee = false ;
                     }
-                    currentTaskUsers = getTaskUsers(currentTaskId,isAssignee,reqMap);
+                    currentTaskUsers =  StringUtils.join(getTaskUsers(task,isAssignee,reqMap), ',');
                     TaskPorcessResult result = new TaskPorcessResult();
                     result.setCurrentTaskId(currentTaskId);
 
@@ -663,15 +663,13 @@ public class WorkFlowServiceImpl implements WorkFlowService {
 
     /**
      * 获取任务的参与者
-     * @param taskId
+     * @param task
      * @param isAssignee 仅包含指派人员
      * @return
      */
 
-    @Override
-    public Set<String> getTaskParticipator(String taskId,boolean isAssignee,Map<String,Object>args) {
+    private Set<String> getTaskUsers(Task task,boolean isAssignee,Map<String,Object>args){
         Set<String> users = new HashSet<String>();
-        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String description = task.getDescription();
 
         String assignee = task.getAssignee();
@@ -688,6 +686,13 @@ public class WorkFlowServiceImpl implements WorkFlowService {
         }
         return users;
     }
+    @Override
+    public Set<String> getTaskParticipator(String taskId,boolean isAssignee,Map<String,Object>args) {
+        Set<String> users = new HashSet<String>();
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        users=getTaskUsers(task,isAssignee,args);
+        return users;
+    }
     private void addFormUsers(Set<String> users,String description,Task task,Map<String,Object>params){
         TaskUserDTO taskUserDTO = JSON.parseObject(description, TaskUserDTO.class);
         Set<Integer> taskUsers = userFormService.getTaskUsers(taskUserDTO);