工作流抄送

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/extensions/listener/ProcessInstanceListener.java

@@ -27,6 +27,7 @@ import org.flowable.identitylink.api.IdentityLinkType;
 import org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntity;
 import org.flowable.task.api.Task;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
+import org.flowable.task.service.impl.persistence.entity.TaskEntityImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.expression.MapAccessor;
@@ -286,7 +287,7 @@ public class ProcessInstanceListener extends AbstractFlowableEventListener {
                 }
             }
         }
-        else if(evt instanceof FlowableEntityEventImpl && evt.getType() != null &&  FlowableEngineEventType.PROCESS_COMPLETED == evt.getType() )
+        else if(evt instanceof FlowableEntityEventImpl && evt.getType() != null &&  FlowableEngineEventType.PROCESS_COMPLETED == evt.getType())
         {
             FlowableEntityEventImpl event=((FlowableEntityEventImpl) evt);
             FlowableEventType eventType = event.getType();
@@ -322,33 +323,29 @@ public class ProcessInstanceListener extends AbstractFlowableEventListener {
             }
 
         }
-        else if(evt instanceof FlowableActivityEventImpl) {
+        else if(evt instanceof FlowableActivityEventImpl  && evt.getType() != null && FlowableEngineEventType.ACTIVITY_COMPLETED == evt.getType()) {
             FlowableActivityEventImpl event = ((FlowableActivityEventImpl) evt);
-            FlowableEventType eventType = event.getType();
-            if (eventType == FlowableEngineEventType.ACTIVITY_COMPLETED && "userTask".equals(event.getActivityType())) {
             if (event.getExecution().getCurrentFlowElement() instanceof UserTask) {
                 UserTask task = (UserTask) event.getExecution().getCurrentFlowElement();
-                    List<Task> exTask = taskService.createTaskQuery().processInstanceId(event.getProcessInstanceId()).list();
-                    String sendCopyTag =  wfCoreService.getParam(task,"form","procfunc");
-                    if(sendCopyTag.contains("sendcopy")){
-                        // 从模板中读取抄送人名单
-                        String sendCopyUserList = wfCoreService.getParam(task,"form","senduser");
-                        if(StringUtils.isEmpty(sendCopyUserList)){
-                            throw new BadRequestAlertException("获取节点抄送用户失败","","");
-                        }
-                        String userIds = wfCoreService.getGroupUsers(sendCopyUserList, event.getExecution());
-                        TaskEntity sendCopyTask = null;
-                        if(exTask.size()>0){
-                            sendCopyTask = wfCoreService.createTask(exTask.get(0));
+                String procFunc = wfCoreService.getParam(task, "form", "procfunc");
+                if (!StringUtils.isEmpty(procFunc) && procFunc.contains("sendcopy")) {
+                    String sendCopyRoles = wfCoreService.getParam(task, "form", "senduser");
+                    if (StringUtils.isEmpty(sendCopyRoles)) {
+                        throw new BadRequestAlertException("获取节点抄送用户失败", "", "");
+                    }
+                    TaskEntity sendCopyTask = new TaskEntityImpl();
+                    List<Task> sendCopyTasks = taskService.createTaskQuery().processInstanceId(event.getProcessInstanceId()).list();
+                    Set<WFMember> sendCopyUsers = wfCoreService.getGroupUsers2(sendCopyRoles, event.getExecution());
+                    if (sendCopyTasks.size() > 0) {
+                        sendCopyTask = wfCoreService.createTask(sendCopyTasks.get(0));
                     }
                     sendCopyTask.setId(UUID.randomUUID().toString().toLowerCase());
                     sendCopyTask.setScopeType("sendcopy");
                     taskService.saveTask(sendCopyTask);
                     // 生成待阅抄送给用户
-                        if(!StringUtils.isEmpty(userIds)){
-                            for (String userid : userIds.split(",")) {
-                                taskService.addUserIdentityLink(sendCopyTask.getId(), userid, "sendcopy");
-                            }
+                    if(!ObjectUtils.isEmpty(sendCopyUsers)){
+                        for (WFMember user : sendCopyUsers) {
+                            taskService.addUserIdentityLink(sendCopyTask.getId(), user.getUserid(), "sendcopy");
                         }
                     }
                 }

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/extensions/service/WFCoreService.java

@@ -1923,7 +1923,7 @@ public class WFCoreService
 		List<IdentityLink> identityLinks = taskService.getIdentityLinksForTask(taskId);
 		identityLinks.forEach(idl->{
 			if(userId.equals(idl.getUserId())){
-				completeSendCopy(identityLinks,task,userId);
+				completeSendCopyTask(identityLinks,task);
 				Map map  =new HashMap();
 				map.put("taskid",task.getId());
 				map.put("userid",userId);
@@ -1938,16 +1938,13 @@ public class WFCoreService
 	 * 判断除了本身其他link是否已读
 	 * @return
 	 */
-	public void completeSendCopy(List<IdentityLink> identityLinks,Task task,String userId){
-		List<IdentityLink> noReadLinks = identityLinks.stream().filter(link -> StringUtils.isEmpty(link.getScopeType())).collect(Collectors.toList());
-		// 全部消息已读之后，将抄送任务推送到history表中
-		String type = task.getScopeType() == null ? "" : task.getScopeType();
-		if(type.equals("sendcopy") && noReadLinks.size() == 1){
-			if(noReadLinks.get(0).getUserId().equals(userId)){
+	public void completeSendCopyTask(List<IdentityLink> identityLinks,Task task){
+		List<IdentityLink> unReadLinks = identityLinks.stream().filter(link -> StringUtils.isEmpty(link.getScopeType())).collect(Collectors.toList());
+		String scopeType = task.getScopeType();
+		if (!StringUtils.isEmpty(scopeType) && "sendcopy".equals(scopeType) && unReadLinks.size() == 1) {
 			taskService.complete(task.getId());
 		}
 	}
-	}
 
 	/**
 	 * @param taskId 当前需要回退的节点