Commit c99115abe7c099eea89783c4892fba303e16154a
1 parent
814c2db6
初始化数据权限模块
Showing
7 changed files
with
11 additions
and
7 deletions
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> { |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | default Integer selectCountByParentId(Long parentId) { |
| 27 | - return selectCount(new QueryWrapper<SysDeptDO>().eq("parent_id", parentId)); | |
| 27 | + return selectCount("parent_id", parentId); | |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | 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> { |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | default Integer selectCountByParentId(Long parentId) { |
| 22 | - return selectCount(new QueryWrapper<SysMenuDO>().eq("parent_id", parentId)); | |
| 22 | + return selectCount("parent_id", parentId); | |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | 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 renamed to yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/interceptor/DataPermissionInterceptor.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/package-info.java
0 → 100644
| 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 renamed to yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/package-info.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datascope/core/package-info.java deleted
| 1 | -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 renamed to yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/interceptor/DataPermissionInterceptorTest.java
| 1 | -package cn.iocoder.yudao.framework.datascope.core.interceptor; | |
| 1 | +package cn.iocoder.yudao.framework.datapermission.core.interceptor; | |
| 2 | 2 | |
| 3 | 3 | import org.junit.jupiter.api.Test; |
| 4 | 4 | |
| ... | ... | @@ -9,7 +9,7 @@ public class DataPermissionInterceptorTest { |
| 9 | 9 | private final DataPermissionInterceptor interceptor = new DataPermissionInterceptor(); |
| 10 | 10 | |
| 11 | 11 | @Test |
| 12 | - void selectSingle() { | |
| 12 | + public void selectSingle() { | |
| 13 | 13 | // 单表 |
| 14 | 14 | assertSql("select * from entity where id = ?", |
| 15 | 15 | "SELECT * FROM entity WHERE id = ? AND tenant_id = 1"); |
| ... | ... | @@ -29,4 +29,8 @@ public class DataPermissionInterceptorTest { |
| 29 | 29 | assertThat(interceptor.parserSingle(sql, null)).isEqualTo(targetSql); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | + public static void main(String[] args) { | |
| 33 | + System.out.println("123"); | |
| 34 | + } | |
| 35 | + | |
| 32 | 36 | } | ... | ... |