From 65cd3defa18decdbbe5e428200cd5ab194f71719 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 13 Nov 2024 10:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-test.yml | 2 +- .../controller/scale/EvaluationConclusionController.java | 6 +++++- .../system/controller/scale/EvaluationRecordController.java | 6 +++++- .../controller/scale/ReservationRefundController.java | 1 + .../system/service/impl/SysScaleOrderServiceImpl.java | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml index 35c90ab..79b3225 100644 --- a/ruoyi-admin/src/main/resources/application-test.yml +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -30,7 +30,7 @@ spring: # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false + p6spy: true # 设置默认的数据源或者数据源组,默认值即为 master primary: master # 严格模式 匹配不到数据源则报错 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java index e52817b..c0b144c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationConclusionController.java @@ -1,6 +1,7 @@ package org.dromara.system.controller.scale; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -36,7 +37,10 @@ public class EvaluationConclusionController extends BaseController { /** * 获取量测结果列表 */ - @SaCheckPermission("evaluation:conclusion:list") + @SaCheckPermission(value = { + "intervene:conclusion:list", + "archive:conclusion:list"}, + mode = SaMode.OR) @GetMapping("/list") public R> getList(SysEvaluationConclusionBo bo) { return R.ok(sysEvaluationConclusionService.queryList(bo)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java index a336385..c826218 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/EvaluationRecordController.java @@ -1,6 +1,7 @@ package org.dromara.system.controller.scale; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import jakarta.servlet.http.HttpServletResponse; @@ -53,7 +54,10 @@ public class EvaluationRecordController extends BaseController { /** * 导出量测记录列表 */ - @SaCheckPermission("evaluation:record:export") + @SaCheckPermission(value = { + "intervene:record:export", + "archive:record:export"}, + mode = SaMode.OR) @Log(title = "个人量测记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java index 18be51e..ee7a83c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ReservationRefundController.java @@ -73,6 +73,7 @@ public class ReservationRefundController extends BaseController { * @param bo * @return */ + @SaCheckPermission("reservation:refund:agree") @Log(title = "同意退款", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/agree") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java index 108556a..6ceb152 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java @@ -74,7 +74,7 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService { Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List records = result.getRecords(); for (SysScaleOrderVo record : records) { - SysScale scale = sysScaleMapper.selectById(record.getId()); + SysScale scale = sysScaleMapper.selectById(record.getScaleId()); record.setScaleName(scale.getScaleName()); } return TableDataInfo.build(result);