bug

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<QltQualityInspectionVo> 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<QltQualityInspectionVo> 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()

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<QltQualityInspe
         lqw.eq(StringUtils.isNotBlank(rectificationUnit), QltQualityInspection::getRectificationUnit, rectificationUnit);
         lqw.eq(ObjectUtils.isNotEmpty(projectId), QltQualityInspection::getProjectId, projectId);
         lqw.eq(ObjectUtils.isNotEmpty(rectificationId), QltQualityInspection::getRectificationId, rectificationId);
-        lqw.eq(req.getCorrectorId() != null, QltQualityInspection::getCorrectorId, req.getCorrectorId());
+        lqw.eq(req.getCorrectorId() != null && !LoginHelper.isSuperAdmin(), QltQualityInspection::getCorrectorId, req.getCorrectorId());
         lqw.eq(req.getCreateBy() != null, QltQualityInspection::getCreateBy, req.getCreateBy());
         lqw.like(StringUtils.isNotBlank(req.getInspectionHeadline()), QltQualityInspection::getInspectionHeadline, req.getInspectionHeadline());
         return lqw;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java

@@ -52,7 +52,7 @@ public class HseSafetyInspectionController extends BaseController {
     /**
      * 查询安全巡检工单列表
      */
-    @SaCheckPermission("safety:safetyInspection:list")
+    @SaCheckPermission(value = {"safety:safetyInspection:list", "safety:subSafetyInspection:list"}, mode = SaMode.OR)
     @GetMapping("/list")
     public TableDataInfo<HseSafetyInspectionVo> 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<HseSafetyInspectionVo> 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()

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java

@@ -392,6 +392,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
         Long rectificationId = req.getRectificationId();
         String status = req.getStatus();
         String reviewType = req.getReviewType();
+        Long correctorId = req.getCorrectorId();
         // 精准查询
         lqw.eq(ObjectUtils.isNotEmpty(projectId), HseSafetyInspection::getProjectId, projectId);
         lqw.like(StringUtils.isNotBlank(checkProject), HseSafetyInspection::getCheckProject, checkProject);
@@ -400,6 +401,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
         lqw.eq(StringUtils.isNotBlank(violationType), HseSafetyInspection::getViolationType, violationType);
         lqw.eq(StringUtils.isNotBlank(rectificationUnit), HseSafetyInspection::getRectificationUnit, rectificationUnit);
         lqw.eq(StringUtils.isNotBlank(reviewType), HseSafetyInspection::getReviewType, reviewType);
+        lqw.eq(correctorId!=null && !LoginHelper.isSuperAdmin(), HseSafetyInspection::getCorrectorId, correctorId);
         if (StringUtils.isNotBlank(status)) {
             if (status.contains(",")) {
                 lqw.in(HseSafetyInspection::getStatus, StringUtils.splitList(status));