Merge branch 'master' of github.com:/hs-web/hsweb-framework

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/service/BpmActivityService.java

@@ -75,7 +75,7 @@ public interface BpmActivityService {
      * 获取下一环节办理人
      *
      * @param procDefId        流程定义ID
-     * @param activityId        图元ID
+     * @param activityId       图元ID
      * @return   节点id对应的办理人
      */
     Map<String, List<String>> getNextClaim(String procDefId, String activityId);

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/test/java/org/hswebframework/web/workflow/flowable/ControllerTest.java

@@ -57,18 +57,12 @@ public class ControllerTest extends SimpleWebApplicationTests {
     // 流程图元数据test
     @Test
     public void activityImplTest() {
-        List<ActivityImpl> activities = bpmActivityService.getActivityByKey("test",null);
-        Assert.assertNotNull(activities);
-        System.out.println("获取到的流程节点:"+activities);
-        for (ActivityImpl a: activities) {
-            if(a.getProperty("type").equals("startEvent")){
-                System.out.println(a);
-                List<PvmTransition> pvmTransitions = a.getOutgoingTransitions();
-                Assert.assertEquals(pvmTransitions.size(), 1);
-                TaskDefinition taskDefinition = (TaskDefinition)pvmTransitions.get(0).getDestination().getProperty("taskDefinition");
-                System.out.println("流程第一节点办理人:"+taskDefinition.getAssigneeExpression());
-            }
-        }
+        ActivityImpl activity = bpmTaskService.selectActivityImplByTask("");
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionKey("testid").latestVersion().active().singleResult();
+        Map<String, List<String>> map = bpmActivityService.getNextClaim(processDefinition.getId(),activity.getId());
+        System.out.println("=========>>>");
+        System.out.println(JSON.toJSONString(map));
+        System.out.println("=========>>>");
     }
 
     // 流程流转test