From 075cda636a68657a8a5b0f5694c6651be9a86fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Fri, 22 Nov 2024 10:38:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor(data):=20=E4=B8=9A=E5=8A=A1=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=87=8C=E7=9A=84=E8=A7=84=E5=88=99=EF=BC=8C=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/data/datascope/PigxDefaultDataScopeHandle.java    | 5 +++++
 .../pigx/common/data/mybatis/MybatisPlusConfiguration.java   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java
index 9d7a45ff9..2dc1677d8 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDataScopeHandle.java
@@ -62,6 +62,11 @@ public class PigxDefaultDataScopeHandle implements DataScopeHandle {
             return true;
         }
 
+        // 业务代码里的规则，覆盖计算规则
+        if (StrUtil.isNotBlank(dataScope.getUsername()) || CollUtil.isNotEmpty(dataScope.getDeptList())) {
+            return false;
+        }
+
         // 获取用户角色ID列表
         List<String> roleIdList = user.getAuthorities().stream()
                 .map(GrantedAuthority::getAuthority)
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
index 15c6b9206..0eeaf94c9 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
@@ -26,7 +26,7 @@ import com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService;
 import com.pig4cloud.pigx.common.data.datascope.DataScopeInnerInterceptor;
 import com.pig4cloud.pigx.common.data.datascope.DataScopeInterceptor;
 import com.pig4cloud.pigx.common.data.datascope.DataScopeSqlInjector;
-import com.pig4cloud.pigx.common.data.datascope.PigxDefaultDatascopeHandle;
+import com.pig4cloud.pigx.common.data.datascope.PigxDefaultDataScopeHandle;
 import com.pig4cloud.pigx.common.data.resolver.SqlFilterArgumentResolver;
 import com.pig4cloud.pigx.common.data.tenant.PigxTenantConfigProperties;
 import com.pig4cloud.pigx.common.data.tenant.PigxTenantHandler;
@@ -115,7 +115,7 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer {
     @ConditionalOnClass(PigxUser.class)
     public DataScopeInterceptor dataScopeInterceptor(RemoteDataScopeService dataScopeService) {
         DataScopeInnerInterceptor dataScopeInnerInterceptor = new DataScopeInnerInterceptor();
-        dataScopeInnerInterceptor.setDataScopeHandle(new PigxDefaultDatascopeHandle(dataScopeService));
+        dataScopeInnerInterceptor.setDataScopeHandle(new PigxDefaultDataScopeHandle(dataScopeService));
         return dataScopeInnerInterceptor;
     }