diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml
index 51ecd3fad..8e549e082 100644
--- a/pigx-common/pigx-common-data/pom.xml
+++ b/pigx-common/pigx-common-data/pom.xml
@@ -48,6 +48,7 @@
com.pig4cloud
pigx-common-security
+ true
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 95839a2fb..160efafd4 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
@@ -17,6 +17,10 @@
package com.pig4cloud.pigx.common.data.mybatis;
+import java.util.List;
+
+import javax.sql.DataSource;
+
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
@@ -26,8 +30,10 @@ import com.pig4cloud.pigx.common.data.datascope.DataScopeSqlInjector;
import com.pig4cloud.pigx.common.data.datascope.PigxDefaultDatascopeHandle;
import com.pig4cloud.pigx.common.data.resolver.SqlFilterArgumentResolver;
import com.pig4cloud.pigx.common.data.tenant.PigxTenantHandler;
+import com.pig4cloud.pigx.common.security.service.PigxUser;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -35,9 +41,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import javax.sql.DataSource;
-import java.util.List;
-
/**
* @author lengleng
* @date 2020-02-08
@@ -62,6 +65,7 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer {
*/
@Bean
@ConditionalOnMissingBean
+ @ConditionalOnClass(PigxUser.class)
public DataScopeHandle dataScopeHandle() {
return new PigxDefaultDatascopeHandle();
}
diff --git a/pigx-visual/pigx-bi-platform/pom.xml b/pigx-visual/pigx-bi-platform/pom.xml
index 97312ae4a..2f0851dce 100755
--- a/pigx-visual/pigx-bi-platform/pom.xml
+++ b/pigx-visual/pigx-bi-platform/pom.xml
@@ -57,8 +57,8 @@
- com.pig4cloud
- pigx-common-security
+ org.springframework.boot
+ spring-boot-starter-security
com.pig4cloud