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

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

@@ -380,9 +380,15 @@ public class WorkFlowServiceImpl implements WorkFlowService {
 
         LoginUser loginUser = UserUtil.getCurrentUser();
         List<TaskPorcessResult>results=new ArrayList<>();
+        //用新的指定人员覆盖旧的指定人员
+        if(reqMap.get("assineeFormUserId")!=null){
+            taskService.setVariable(taskId,"assineeFormUserId",reqMap.get("assineeFormUserId"));
+        }
         String assineeFormUserId = (String) taskService.getVariable(taskId, "assineeFormUserId");
-        if(reqMap.get(assineeFormUserId)==null&&assineeFormUserId!=null)
-        reqMap.put("assineeFormUserId",assineeFormUserId);
+        if(assineeFormUserId!=null){
+            reqMap.put("assineeFormUserId",assineeFormUserId);
+        }
+
         try {
             handleTask(action, taskId, String.valueOf(loginUser.getId()), reqMap, comment);
             String processInstanceId = task.getProcessInstanceId();