Merge branch 'master' of https://github.com/java110/MicroCommunity

CommonService/src/main/java/com/java110/common/activity/complaint/ComplaintUserListener.java

@@ -40,7 +40,7 @@ public class ComplaintUserListener implements TaskListener , ExecutionListener {
         if (auditUserDtos == null || auditUserDtos.size() < 1) {
             return;
         }
-        delegateTask.addCandidateUser(auditUserDtos.get(0).getUserId());
+        //delegateTask.addCandidateUser(auditUserDtos.get(0).getUserId());
 
         delegateTask.setAssignee(auditUserDtos.get(0).getUserId());
     }

CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java

@@ -218,6 +218,7 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
         variables.put("currentUserId", complaintDto.getCurrentUserId());
         //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
         //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
+        taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
         taskService.complete(complaintDto.getTaskId(), variables);
 
         ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();