diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java index b71d4db4..eb1113ad 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java @@ -60,7 +60,7 @@ public class QltQualityInspectionController extends BaseController { /** * 查询质量-检查工单列表 */ - @SaCheckPermission("quality:qualityInspection:list") + @SaCheckPermission(value = {"quality:qualityInspection:list","quality:subQualityInspection:list"}, mode = SaMode.OR) @GetMapping("/list") public TableDataInfo list(QltQualityInspectionQueryReq req, PageQuery pageQuery) { return qualityInspectionService.queryPageList(req, pageQuery); @@ -101,7 +101,7 @@ public class QltQualityInspectionController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("quality:qualityInspection:query") +// @SaCheckPermission("quality:qualityInspection:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -122,7 +122,7 @@ public class QltQualityInspectionController extends BaseController { /** * 修改质量-检查工单 */ - @SaCheckPermission("quality:qualityInspection:edit") + @SaCheckPermission(value = {"quality:qualityInspection:edit","quality:subQualityInspection:edit"}, mode = SaMode.OR) @Log(title = "质量-检查工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java index 65a4a8fd..b65dc0ac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java @@ -22,6 +22,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.exception.OssException; import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.utils.DocumentUtil; import org.dromara.project.service.IBusProjectService; import org.dromara.quality.constant.QltQualityConstant; @@ -364,7 +365,7 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl list(HseSafetyInspectionQueryReq req, PageQuery pageQuery) { return safetyInspectionService.queryPageListWeb(req, pageQuery); @@ -74,7 +74,7 @@ public class HseSafetyInspectionController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("safety:safetyInspection:query") +// @SaCheckPermission("safety:safetyInspection:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -117,7 +117,7 @@ public class HseSafetyInspectionController extends BaseController { /** * 修改安全巡检工单 */ - @SaCheckPermission("safety:safetyInspection:edit") + @SaCheckPermission(value = {"\"safety:safetyInspection:edit", "safety:subSafetyInspection:edit"}, mode = SaMode.OR) @Log(title = "安全巡检工单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java index 440fade3..4cd589f9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java @@ -392,6 +392,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl