From 4cc420799e262251750c786ea5ed9c29236ac5ca Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Fri, 20 Mar 2026 13:52:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在DataScopeAspect中修复角色数据权限分配的逻辑
- 在ProjectOrderInfoServiceImpl中添加@DataScope注解以限制导出和列表数据范围
---
 .../main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java  | 2 +-
 .../com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 77db4d73..a0b77180 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -105,7 +105,7 @@ public class DataScopeAspect
             {
                 continue;
             }
-            if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+            if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)) )
             {
                 continue;
             }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index d18a49c0..a43aee65 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -537,6 +537,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     }
 
     @Override
+    @DataScope(deptAlias = "t5", userAlias = "t5")
     public String exportList(ProjectOrderInfo projectOrderInfo) {
         try {
             // 获取项目信息列表
@@ -562,6 +563,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     }
 
     @Override
+    @DataScope(deptAlias = "t5", userAlias = "t5")
     public List<Map<String, Object>> listExportData(ProjectOrderInfo projectOrderInfo) {
         List<ProjectOrderInfo> projectInfos = this.selectProjectOrderInfoList(projectOrderInfo);
         if (CollUtil.isEmpty(projectInfos)) {