权限管理修改

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -19,7 +19,7 @@ import com.ruoyi.system.api.model.LoginUser;
 
 /**
  * 数据过滤处理
- * 
+ *
  * @author ruoyi
  */
 @Aspect
@@ -81,7 +81,7 @@ public class DataScopeAspect
 
     /**
      * 数据范围过滤
-     * 
+     *
      * @param joinPoint 切点
      * @param user 用户
      * @param deptAlias 部门别名
@@ -109,7 +109,10 @@ public class DataScopeAspect
             }
             if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
             {
-                continue;
+                if (!DATA_SCOPE_ALL.equals(dataScope)){
+                    continue;
+                }
+
             }
             if (DATA_SCOPE_ALL.equals(dataScope))
             {

ruoyi-modules/ruoyi-base/src/main/java/com/ruoyi/base/controller/CertificateController.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 
 /**
  * 合格证Controller
- * 
+ *
  * @author ruoyi
  * @date 2026-03-31
  */
@@ -38,7 +38,7 @@ public class CertificateController extends BaseController
     /**
      * 查询合格证列表
      */
-    @RequiresPermissions("base:certificate:list")
+
     @GetMapping("/list")
     public TableDataInfo list(Certificate certificate)
     {
@@ -50,7 +50,7 @@ public class CertificateController extends BaseController
     /**
      * 导出合格证列表
      */
-    @RequiresPermissions("base:certificate:export")
+
     @Log(title = "合格证", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Certificate certificate)
@@ -63,7 +63,7 @@ public class CertificateController extends BaseController
     /**
      * 获取合格证详细信息
      */
-    @RequiresPermissions("base:certificate:query")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class CertificateController extends BaseController
     /**
      * 新增合格证
      */
-    @RequiresPermissions("base:certificate:add")
+
     @Log(title = "合格证", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Certificate certificate)
@@ -84,7 +84,7 @@ public class CertificateController extends BaseController
     /**
      * 修改合格证
      */
-    @RequiresPermissions("base:certificate:edit")
+
     @Log(title = "合格证", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Certificate certificate)
@@ -95,7 +95,7 @@ public class CertificateController extends BaseController
     /**
      * 删除合格证
      */
-    @RequiresPermissions("base:certificate:remove")
+
     @Log(title = "合格证", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/ruoyi-base/src/main/java/com/ruoyi/base/controller/FieldController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.Logical;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteUserService;
@@ -53,7 +54,8 @@ public class FieldController extends BaseController
      * 查询地块名称列表
      */
     /*@RequiresPermissions(value = {"base:supplier:list","base:contract:list","base:mounted:list"},logical = Logical.OR)*/
-    @RequiresPermissions("base:field:list")
+    //@RequiresPermissions("base:field:list")
+    //@RequiresPermissions(value = {"base:field:list","base:batch:list"},logical = Logical.OR)
     @GetMapping("/listName")
     public List<Field> listName(Field field) {
         return fieldService.selectFieldListName(field);

ruoyi-modules/ruoyi-base/src/main/java/com/ruoyi/base/controller/ReportController.java

@@ -43,7 +43,7 @@ public class ReportController extends BaseController
     /**
      * 查询检测报告列表
      */
-    @RequiresPermissions("base:report:list")
+
     @GetMapping("/list")
     public TableDataInfo list(Report report)
     {
@@ -55,7 +55,7 @@ public class ReportController extends BaseController
     /**
      * 导出检测报告列表
      */
-    @RequiresPermissions("base:report:export")
+
     @Log(title = "检测报告", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Report report)
@@ -68,7 +68,7 @@ public class ReportController extends BaseController
     /**
      * 获取检测报告详细信息
      */
-    @RequiresPermissions("base:report:query")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -78,7 +78,7 @@ public class ReportController extends BaseController
     /**
      * 新增检测报告
      */
-    @RequiresPermissions("base:report:add")
+
     @Log(title = "检测报告", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Report report)
@@ -89,7 +89,7 @@ public class ReportController extends BaseController
     /**
      * 修改检测报告
      */
-    @RequiresPermissions("base:report:edit")
+
     @Log(title = "检测报告", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Report report)
@@ -100,7 +100,7 @@ public class ReportController extends BaseController
     /**
      * 删除检测报告
      */
-    @RequiresPermissions("base:report:remove")
+
     @Log(title = "检测报告", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -385,7 +385,7 @@ public class SysUserController extends BaseController
      * 获取部门树列表
      */
     /*@RequiresPermissions("system:user:list")*/
-    @RequiresPermissions(value = {"system:user:list","base:field:list"},logical = Logical.OR)
+    //@RequiresPermissions(value = {"system:user:list","base:field:list","base:batch:list"},logical = Logical.OR)
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {