From 1e657b5d336e41299a1ec40e89eb0f2a07c0b738 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 十月 2025 19:55:54 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/query/AssetMainPageQuery.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
index 58966a1..787b77a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetMainController.java
@@ -42,7 +42,7 @@
Long userId = SecurityUtils.getUserId();
boolean isAdmin = SecurityUtils.isAdmin(userId);
- if (!isAdmin) {
+ if (!isAdmin && pageQuery.getCheckDataPermission()) {
try {
// 获取当前用户的部门名称
String deptName = sysUserService.selectUserById(userId).getDeptName();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetMainPageQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetMainPageQuery.java
index 0d8a410..8c187e2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetMainPageQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetMainPageQuery.java
@@ -32,5 +32,8 @@
@ApiModelProperty("所属部门ID，前端不传")
private Integer deptId;
+
+ @ApiModelProperty("是否校验数据权限")
+ private Boolean checkDataPermission = true;
}
--
Gitblit v1.7.1