工作流角色

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

@@ -161,10 +161,12 @@ public class ProcessInstanceListener extends AbstractFlowableEventListener {
                                     Expression exp = parser.parseExpression(elUserId);
                                     context.addPropertyAccessor(new MapAccessor());
                                     context.setVariable("activedata",executionMap);
-                                    String userId = exp.getValue(context,String.class);
-                                    if (!StringUtils.isEmpty(userId)) {
-                                        processUserIds.add(userId);  // TODO : 默认为单人，需优化为多人
-                                        processRoles.add(group);
+                                    String userIds = exp.getValue(context,String.class);
+                                    for(String userId: userIds.split(",")){
+                                        if (!StringUtils.isEmpty(userId)) {
+                                            processUserIds.add(userId);
+                                            processRoles.add(group);
+                                        }
                                     }
                                 }
                             }

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

@@ -1039,7 +1039,12 @@ public class WFCoreService
 					processDefinitionKey="dyna-"+dynainstid+"-"+system+"-"+booking+"-"+params[1];
 				else
 					processDefinitionKey=system+"-"+booking+"-"+params[1];
-				WFProcessDefinition old=iwfProcessDefinitionService.get(processDefinitionKey);
+
+				WFProcessDefinition old = new WFProcessDefinition();
+				old.setDefinitionkey(processDefinitionKey);
+				if(iwfProcessDefinitionService.checkKey(old)){
+					old = iwfProcessDefinitionService.get(processDefinitionKey);
+				}
 				WFProcessDefinition wfProcessDefinition=new WFProcessDefinition();
 				wfProcessDefinition.setDefinitionkey(processDefinitionKey);
 				wfProcessDefinition.setDeploykey(processDefinitionKey);
@@ -1423,10 +1428,10 @@ public class WFCoreService
 					}
 					if(fieldvalue!=null){
 						if("org".equals(userData)){
-							orgList.addAll(Arrays.asList(String.valueOf(fieldvalue).split(";")));
+							orgList.addAll(Arrays.asList(String.valueOf(fieldvalue).split(",")));
 						}
 						else if("dept".equals(userData)){
-							deptList.addAll(Arrays.asList(String.valueOf(fieldvalue).split(";")));
+							deptList.addAll(Arrays.asList(String.valueOf(fieldvalue).split(",")));
 						}
 					}
 				}