diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java index 2443155..a174772 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java @@ -42,10 +42,16 @@ public class SysScaleFactorController extends BaseController { */ @SaCheckPermission("scale:factor:pageList") @GetMapping("/pageList") - public TableDataInfo list(SysScaleFactorBo bo, PageQuery pageQuery) { + public TableDataInfo pageList(SysScaleFactorBo bo, PageQuery pageQuery) { return sysScaleFactorService.queryPageList(bo, pageQuery); } + @GetMapping("/list") + public R> list(SysScaleFactorBo bo) { + List list = sysScaleFactorService.queryList(bo); + return R.ok(list); + } + /** * 导出测评因子列表 */ @@ -65,7 +71,7 @@ public class SysScaleFactorController extends BaseController { @SaCheckPermission("scale:factor:query") @GetMapping("/{factorId}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long factorId) { + @PathVariable Long factorId) { return R.ok(sysScaleFactorService.queryById(factorId)); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java index f9c73e9..8531bb3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java @@ -3,7 +3,6 @@ package org.dromara.scale.controller.web; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; @@ -20,8 +19,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -import static org.dromara.common.satoken.utils.LoginHelper.getLoginUser; - /** *

TODO

*