From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java b/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java
index a29cf1d..780753e 100644
--- a/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java
+++ b/service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java
@@ -94,7 +94,6 @@
*/
@RequestMapping(value = "/deleteOaWorkflow", method = RequestMethod.POST)
public ResponseEntity<String> deleteOaWorkflow(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "flowId", "flowId涓嶈兘涓虹┖");
@@ -113,12 +112,14 @@
*/
@RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value="flowId",required = false) String flowId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
oaWorkflowDto.setPage(page);
oaWorkflowDto.setRow(row);
oaWorkflowDto.setStoreId(storeId);
+ oaWorkflowDto.setFlowId(flowId);
return getOaWorkflowBMOImpl.get(oaWorkflowDto);
}
@@ -198,12 +199,14 @@
*/
@RequestMapping(value = "/queryOaWorkflowXml", method = RequestMethod.GET)
public ResponseEntity<String> queryOaWorkflowXml(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value="flowId") String flowId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
oaWorkflowXmlDto.setPage(page);
oaWorkflowXmlDto.setRow(row);
oaWorkflowXmlDto.setStoreId(storeId);
+ oaWorkflowXmlDto.setFlowId(flowId);
return getOaWorkflowXmlBMOImpl.get(oaWorkflowXmlDto);
}
}
--
Gitblit v1.8.0