优化代码

maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java

@@ -27,6 +27,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T>  extends ServiceImpl<M,
 
     /**
      * 获取分页对象
+     *
      * @param query 分页参数
      */
     protected IPage<T> getPage(Query query) {
@@ -45,7 +46,18 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T>  extends ServiceImpl<M,
     }
 
     /**
+     * MyBatis-Plus 数据权限
+     */
+    protected void dataScopeWrapper(LambdaQueryWrapper<T> queryWrapper) {
+        DataScope dataScope = getDataScope(null, null);
+        if (dataScope != null) {
+            queryWrapper.apply(dataScope.getSqlFilter());
+        }
+    }
+
+    /**
      * 原生SQL 数据权限
+     *
      * @param tableAlias 表别名，多表关联时，需要填写表别名
      * @param orgIdAlias 机构ID别名，null：表示org_id
      * @return 返回数据权限
@@ -95,15 +107,4 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T>  extends ServiceImpl<M,
 
         return new DataScope(sqlFilter.toString());
     }
-
-    /**
-     * MyBatis-Plus 数据权限
-     */
-    protected void dataScopeWrapper(LambdaQueryWrapper<T> queryWrapper)  {
-        DataScope dataScope = getDataScope(null, null);
-        if (dataScope != null){
-            queryWrapper.apply(dataScope.getSqlFilter());
-        }
-    }
-
 }

maku-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java

@@ -72,7 +72,7 @@ public class SecurityConfig {
     }
 
     @Bean
-    SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+    SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         // 忽略授权的地址列表
         List<String> permitList = permitResource.getPermitList();
         String[] permits = permitList.toArray(new String[0]);