zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: selectMenuListByRoleId

V0.5.x
jay 2023-06-12 18:08:28 +08:00
parent d25227d903
commit c188cceb6f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysRoleDataImpl.java
View File

@ -66,22 +66,20 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
@Override
public List<Long> selectMenuListByRoleId(Long roleId, boolean menuCheckStrictly) {
List<Long> roleIds = jpaQueryFactory.select(tbSysMenu.id)
.from(tbSysMenu)
.innerJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
.where(PredicateBuilder.instance()
.and(tbSysRoleMenu.roleId.eq(roleId))
.build())
.orderBy(tbSysMenu.parentId.asc(), tbSysMenu.orderNum.asc()).fetch();
PredicateBuilder predicateBuilder = PredicateBuilder.instance()
.and(tbSysRoleMenu.roleId.eq(roleId));
if (menuCheckStrictly) {
List<Long> roleIds = jpaQueryFactory.select(tbSysMenu.parentId)
.from(tbSysMenu)
.innerJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId).and(tbSysRoleMenu.roleId.eq(roleId)))
.fetch();
predicateBuilder.and(tbSysMenu.id.notIn(roleIds));
}
return jpaQueryFactory.select(Projections.bean(Long.class, tbSysMenu.id))
return jpaQueryFactory.select( tbSysMenu.id)
.from(tbSysMenu)
.leftJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
.where(predicateBuilder.build())