Merge branch 'dev'

renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java

@@ -524,10 +524,10 @@ public class ActTaskService extends BaseServiceImpl {
     public void completeTask(String taskId, String comment) {
         String userId = SecurityUser.getUserId().toString();
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-        if (StringUtils.isNotEmpty(task.getAssignee())
+//        if (StringUtils.isNotEmpty(task.getAssignee())
-                && !task.getAssignee().equals(userId)) {
+//                && !task.getAssignee().equals(userId)) {
-            taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人
+//            taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人
-        }
+//        }
         if (StringUtils.isNotEmpty(comment)) {
             taskService.addComment(taskId, task.getProcessInstanceId(), comment);
         }