oa 分页

yudao-server/src/main/java/cn/iocoder/yudao/server/service/PortalOaFlow.java

@@ -131,24 +131,20 @@ public class PortalOaFlow {
 
         map.put("root", ImmutableMap.of("craterid", oaId));
         params.put("conditions", map);
-        params.put("pageSize", pageSize);
-        params.put("pageNo", pageNo);
+//        params.put("pageSize", pageSize);
+//        params.put("pageNo", pageNo);
         System.out.println("-----------"+JSON.toJSONString(params));
         HttpEntity<Map<String, Object>> requestEntityOut1 = new HttpEntity<>(params, headersOut);
         // 待办明细
         String todoList = noCookieRestTemplate.postForObject(
-                "https://yfoa.keruioil.com/api/workflow/paService/getDoingWorkflowRequestList",
+                "https://yfoa.keruioil.com/api/workflow/paService/getDoingWorkflowRequestList?pageNo="+pageNo+"&pageSize="+pageSize,
                 requestEntityOut1, String.class
         );
 
         List<JSONObject> jsonObjects = JSON.parseArray(todoList, JSONObject.class);
 
-        // 待办明细
-//        map.put("root", ImmutableMap.of("craterid", oaId));
-//        params.put("conditions", map);
-//        HttpEntity<Map<String, Object>> requestEntityOut1 = new HttpEntity<>(params, headersOut);
         //已办明细
-        String doneList = noCookieRestTemplate.postForObject("https://yfoa.keruioil.com/api/workflow/paService/getHandledWorkflowRequestList", requestEntityOut1, String.class);
+        String doneList = noCookieRestTemplate.postForObject("https://yfoa.keruioil.com/api/workflow/paService/getHandledWorkflowRequestList?pageNo="+pageNo+"&pageSize="+pageSize, requestEntityOut1, String.class);
 
         List<JSONObject> doneJsonObjects = JSON.parseArray(doneList, JSONObject.class);
         return ImmutableMap.of("todoCount", out, "todoList", jsonObjects,"doneCount", done,"doneList", doneJsonObjects);