diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java index 490c981e..b40ce69b 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java @@ -99,7 +99,8 @@ public class HistoryController { @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"), - @ApiImplicitParam(name = "ended", value = "是否结束(true:是,false:否)", paramType = "query", dataType = "String") + @ApiImplicitParam(name = "ended", value = "是否结束(true:是,false:否)", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String") }) // @RequiresPermissions("sys:his:all") public Result getMyProcessInstancePage(@ApiIgnore @RequestParam Map params) { diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java index 7a4adf75..766b274b 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java @@ -185,6 +185,10 @@ public class ActHistoryService { query.processInstanceBusinessKey((String) params.get("businessKey")); } + if (StringUtils.isNotEmpty((String) params.get("processDefinitionKey"))) { // 流程定义key + query.processDefinitionKey((String) params.get("processDefinitionKey")); + } + if (StringUtils.isNotEmpty((String) params.get("processDefinitionId"))) { query.processDefinitionId((String) params.get("processDefinitionId")); }