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,