From 4ed0a389b01691beefa6ab95882117e26cb2bb66 Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 29 Aug 2024 16:29:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor(X-Pack):=20=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../io/dataease/api/xpack/dataFilling/DataFillingApi.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/de-xpack b/de-xpack index 601d8c33f2..0b94df2af3 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 601d8c33f29ab0921b53a2847add0afdc7af9f90 +Subproject commit 0b94df2af3e212aa0b6fee2e6b848818392c5b74 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java index b933cd7cf3..547406160b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java @@ -67,6 +67,7 @@ public interface DataFillingApi { @PostMapping("/form/{formId}/batch-delete") void batchDeleteRowData(@PathVariable("formId") Long formId, @RequestBody List ids) throws Exception; + @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/rowData/save") DataFillFormTableDataResponse saveRowData(@PathVariable("formId") Long formId, @RequestBody Map data) throws Exception; @@ -105,8 +106,8 @@ public interface DataFillingApi { @GetMapping("/sub-task/{id}/users/list/{type}") List> listSubTaskUser(@PathVariable("id") Long id, @PathVariable("type") String type) throws Exception; - @PostMapping("/user-task") - List listUserTask(@RequestBody DfUserTaskRequest request) throws Exception; + @PostMapping("/user-task/page/{goPage}/{pageSize}") + IPage listUserTask(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize,@RequestBody DfUserTaskRequest request) throws Exception; @GetMapping("/user-task/list/{id}") DfUserTaskData listUserTaskData(@PathVariable("id") Long id) throws Exception;