还原处理连接角色逻辑

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

@@ -509,79 +509,43 @@ public class WFCoreService
 		return instance;
 	}
 
-	public List<WFTaskWay> getWFLink(String system,String appname,
-									 String entity, String businessKey,String taskDefinitionKey) {
-		List<WFTaskWay> taskWays=new ArrayList<>();
-		String processInstanceBusinessKey=system+":"+entity+":k-"+businessKey;
-		String userId=AuthenticationUser.getAuthenticationUser().getUserid();
-		if(StringUtils.isEmpty(userId))
-			return taskWays;
-		TaskQuery query=taskService.createTaskQuery().taskCandidateOrAssigned(userId).processInstanceBusinessKey(processInstanceBusinessKey);
-		if(!StringUtils.isEmpty(taskDefinitionKey))
-			query.taskDefinitionKey(taskDefinitionKey);
-		List<Task> list=query.orderByTaskCreateTime().desc().listPage(0,1);
-		if(list.size()==0)
-			return taskWays;
-		Task task=list.get(0);
-		LinkedHashMap activeData = (LinkedHashMap)runtimeService.getVariable(task.getExecutionId(),"activedata");
-		if((!StringUtils.isEmpty(task.getProcessDefinitionId()))&&(!StringUtils.isEmpty(task.getTaskDefinitionKey()))) {
-			UserTask userTask = wfModelService.getModelStepById(task.getProcessDefinitionId()).get(task.getTaskDefinitionKey());
-			//设置流程表单
-			setProcessForm(userTask);
-			if(userTask!=null&&userTask.getOutgoingFlows()!=null) {
-				for(SequenceFlow sequenceFlow:userTask.getOutgoingFlows()) {
-					WFTaskWay way=new WFTaskWay();
-					way.setSequenceflowid(sequenceFlow.getId());
-					way.setSequenceflowname(sequenceFlow.getName());
-					if(task.getProcessDefinitionId().indexOf(":")>0)
-						way.setProcessdefinitionkey(task.getProcessDefinitionId().split(":")[0]);
-					way.setTaskid(task.getId());
-					way.setProcessinstanceid(task.getProcessInstanceId());
-					way.setTaskdefinitionkey(task.getTaskDefinitionKey());
-					way.setProcessinstancebusinesskey(processInstanceBusinessKey);
-					//设置流程交互表单
-					setTaskWayForm(sequenceFlow,way);
-					String userIds = "";
-					String activeIds = "";
-					//过滤权限不足的用户
-//					String roles = (String) way.get("roles");
-//					String activeForm = (String) way.get("activeData");
-					String roles = null;
-					String activeForm = null;
-					String[] both = new String[]{};
-
-					if(activeForm != null){
-						String[] temp = activeForm.split(",");
-						int iMax = temp.length - 1;
-						for(int i = 0;i < temp.length ;i++){
-							if (iMax == -1){
-								break;
-							}
-							Object key = activeData.get(temp[i]);
-							if(!ObjectUtils.isEmpty(key)) {
-								activeIds += key;
-								if (i == iMax) {
-									break;
-								}
-								activeIds += ",";
-							}
-						}
-						if(activeIds.endsWith(",")){
-							activeIds = activeIds.substring(0,activeIds.lastIndexOf(","));
-						}
-					}
-					both = (String[]) ArrayUtils.addAll(both, activeIds.split(","));
-
-					userIds = getGroupUsers(roles,null);
-					both = (String[]) ArrayUtils.addAll(both, userIds.split(","));
-					if(Arrays.asList(both).contains(userId) || (roles == null && activeForm == null)){
-						taskWays.add(way);
-					}
-				}
-			}
-		}
-		return taskWays;
-	}
+    public List<WFTaskWay> getWFLink(String system,String appname,
+                                     String entity, String businessKey,String taskDefinitionKey) {
+        List<WFTaskWay> taskWays=new ArrayList<>();
+        String processInstanceBusinessKey=system+":"+entity+":k-"+businessKey;
+        String userId=AuthenticationUser.getAuthenticationUser().getUserid();
+        if(StringUtils.isEmpty(userId))
+            return taskWays;
+        TaskQuery query=taskService.createTaskQuery().taskCandidateOrAssigned(userId).processInstanceBusinessKey(processInstanceBusinessKey);
+        if(!StringUtils.isEmpty(taskDefinitionKey))
+            query.taskDefinitionKey(taskDefinitionKey);
+        List<Task> list=query.orderByTaskCreateTime().desc().listPage(0,1);
+        if(list.size()==0)
+            return taskWays;
+        Task task=list.get(0);
+        if((!StringUtils.isEmpty(task.getProcessDefinitionId()))&&(!StringUtils.isEmpty(task.getTaskDefinitionKey()))) {
+            UserTask userTask = wfModelService.getModelStepById(task.getProcessDefinitionId()).get(task.getTaskDefinitionKey());
+            //设置流程表单
+            setProcessForm(userTask);
+            if(userTask!=null&&userTask.getOutgoingFlows()!=null) {
+                for(SequenceFlow sequenceFlow:userTask.getOutgoingFlows()) {
+                    WFTaskWay way=new WFTaskWay();
+                    way.setSequenceflowid(sequenceFlow.getId());
+                    way.setSequenceflowname(sequenceFlow.getName());
+                    if(task.getProcessDefinitionId().indexOf(":")>0)
+                        way.setProcessdefinitionkey(task.getProcessDefinitionId().split(":")[0]);
+                    way.setTaskid(task.getId());
+                    way.setProcessinstanceid(task.getProcessInstanceId());
+                    way.setTaskdefinitionkey(task.getTaskDefinitionKey());
+                    way.setProcessinstancebusinesskey(processInstanceBusinessKey);
+                    //设置流程交互表单
+                    setTaskWayForm(sequenceFlow,way);
+                    taskWays.add(way);
+                }
+            }
+        }
+        return taskWays;
+    }
 
 	public List<WFTaskWay> getTaskLink(String system,String appname, String entity, String businessKey,String taskId) {
 		List<WFTaskWay> taskWays=new ArrayList<>();