From 133c95d79328ade246867743185b87b348c4fb30 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Mon, 26 Sep 2022 13:53:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=9C=BA?= =?UTF-8?q?=E7=AB=99=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/controller/WorkStationController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkStationController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkStationController.java index 03925dc8..50ad0f59 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkStationController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkStationController.java @@ -71,7 +71,7 @@ public class WorkStationController extends BaseController { @GetMapping("/getStationPage") - public TableDataInfo getStationList(String tenantId) { + public TableDataInfo getStationPage(String tenantId) { startPage(); Map params = new HashMap<>(); @@ -82,6 +82,17 @@ public class WorkStationController extends BaseController { } + @GetMapping("/getStationList") + public R getStationList(HttpServletRequest request) { + LoginUser logUser = logUserUtils.getLogUser(request); + Map params = new HashMap<>(); + params.put("tenantId", logUser.getTenantId()); + params.put("delFlag", 0); + + return R.ok(stationService.getStationList(params)); + } + + @GetMapping("/getTree") public TableDataInfo getTree( HttpServletRequest request,