初始化数据权限模块

yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/dept/SysDeptMapper.java

@@ -24,7 +24,7 @@ public interface SysDeptMapper extends BaseMapperX<SysDeptDO> {
     }
 
     default Integer selectCountByParentId(Long parentId) {
-        return selectCount(new QueryWrapper<SysDeptDO>().eq("parent_id", parentId));
+        return selectCount("parent_id", parentId);
     }
 
     default boolean selectExistsByUpdateTimeAfter(Date maxUpdateTime) {

yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/permission/SysMenuMapper.java

@@ -19,7 +19,7 @@ public interface SysMenuMapper extends BaseMapperX<SysMenuDO> {
     }
 
     default Integer selectCountByParentId(Long parentId) {
-        return selectCount(new QueryWrapper<SysMenuDO>().eq("parent_id", parentId));
+        return selectCount("parent_id", parentId);
     }
 
     default List<SysMenuDO> selectList(SysMenuListReqVO reqVO) {

yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datascope/core/interceptor/DataPermissionInterceptor.java → yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/interceptor/DataPermissionInterceptor.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.framework.datascope.core.interceptor;
+package cn.iocoder.yudao.framework.datapermission.core.interceptor;
 
 import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.yudao.framework.datapermission.core;

yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datascope/package-info.java → yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/package-info.java

@@ -1,4 +1,4 @@
 /**
  * 基于 JSqlParser 解析 SQL，增加数据权限的 WHERE 条件
  */
-package cn.iocoder.yudao.framework.datascope;
+package cn.iocoder.yudao.framework.datapermission;

yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datascope/core/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.yudao.framework.datascope.core;

yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datascope/core/interceptor/DataPermissionInterceptorTest.java → yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/interceptor/DataPermissionInterceptorTest.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.framework.datascope.core.interceptor;
+package cn.iocoder.yudao.framework.datapermission.core.interceptor;
 
 import org.junit.jupiter.api.Test;
 
@@ -9,7 +9,7 @@ public class DataPermissionInterceptorTest {
     private final DataPermissionInterceptor interceptor = new DataPermissionInterceptor();
 
     @Test
-    void selectSingle() {
+    public void selectSingle() {
         // 单表
         assertSql("select * from entity where id = ?",
                 "SELECT * FROM entity WHERE id = ? AND tenant_id = 1");
@@ -29,4 +29,8 @@ public class DataPermissionInterceptorTest {
         assertThat(interceptor.parserSingle(sql, null)).isEqualTo(targetSql);
     }
 
+    public static void main(String[] args) {
+        System.out.println("123");
+    }
+
 }