push

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

@@ -16,6 +16,7 @@ import cn.ibizlab.util.service.RemoteService;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.ArrayUtils;
 import org.flowable.bpmn.BpmnAutoLayout;
 import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.*;
@@ -520,6 +521,7 @@ public class WFCoreService
 		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());
 			//设置流程表单
@@ -537,10 +539,45 @@ public class WFCoreService
 					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;
 	}
 
@@ -1235,6 +1272,9 @@ public class WFCoreService
 				}
 				else
 				{
+					if (delegateExecution == null) {
+						userData2="";
+					} else {
 						Object activedata=delegateExecution.getVariable("activedata");
 						if(activedata!=null&&activedata instanceof Map) {
 							Map entity = (Map) activedata;
@@ -1246,6 +1286,8 @@ public class WFCoreService
 						else
 							userData2="";
 					}
+
+				}
 				if(!StringUtils.isEmpty(userData2))
 				{
 					if(userData.indexOf("dept")>=0||userData.indexOf("orgsec")>=0)
@@ -1254,10 +1296,6 @@ public class WFCoreService
 						orgid=userData2;
 				}
 			}
-
-
-
-
 			WFGroup group=iwfGroupService.get(groupId);
 			List<WFMember> list=group.getWfmember();
 			if (list!=null)