解决角色列表为空时可能存在的SQL错误;将api_set字段长度改为3000

This commit is contained in:
Zhaoyang 2020-03-18 23:09:00 +08:00
parent e4b4187bdb
commit a9aff3009d
7 changed files with 18 additions and 5 deletions

View File

@ -52,6 +52,9 @@ public class IamRolePermissionServiceImpl extends BaseIamServiceImpl<IamRolePerm
@Override @Override
public List<IamFrontendPermission> getPermissionList(String application, List<Long> roleIds) { public List<IamFrontendPermission> getPermissionList(String application, List<Long> roleIds) {
if (V.isEmpty(roleIds)) {
return Collections.emptyList();
}
List<Long> permissionIds = getPermissionIdsByRoleIds(application, roleIds); List<Long> permissionIds = getPermissionIdsByRoleIds(application, roleIds);
if(V.isEmpty(permissionIds)){ if(V.isEmpty(permissionIds)){
return Collections.emptyList(); return Collections.emptyList();
@ -66,7 +69,13 @@ public class IamRolePermissionServiceImpl extends BaseIamServiceImpl<IamRolePerm
@Override @Override
public List<String> getApiUrlList(String application, List<Long> roleIds) { public List<String> getApiUrlList(String application, List<Long> roleIds) {
if (V.isEmpty(roleIds)) {
return Collections.emptyList();
}
List<Long> permissionIds = getPermissionIdsByRoleIds(application, roleIds); List<Long> permissionIds = getPermissionIdsByRoleIds(application, roleIds);
if (V.isEmpty(permissionIds)) {
return Collections.emptyList();
}
// 查询权限 // 查询权限
List<IamFrontendPermission> frontendPermissions = iamFrontendPermissionService.getEntityList( List<IamFrontendPermission> frontendPermissions = iamFrontendPermissionService.getEntityList(
Wrappers.<IamFrontendPermission>lambdaQuery() Wrappers.<IamFrontendPermission>lambdaQuery()
@ -131,6 +140,9 @@ public class IamRolePermissionServiceImpl extends BaseIamServiceImpl<IamRolePerm
* @return * @return
*/ */
private List<Long> getPermissionIdsByRoleIds(String application, List<Long> roleIds){ private List<Long> getPermissionIdsByRoleIds(String application, List<Long> roleIds){
if (V.isEmpty(roleIds)) {
return Collections.emptyList();
}
List<IamRolePermission> permissions = getEntityList(Wrappers.<IamRolePermission>lambdaQuery() List<IamRolePermission> permissions = getEntityList(Wrappers.<IamRolePermission>lambdaQuery()
.select(IamRolePermission::getPermissionId) .select(IamRolePermission::getPermissionId)
.in(IamRolePermission::getRoleId, roleIds)); .in(IamRolePermission::getRoleId, roleIds));

View File

@ -70,7 +70,7 @@ create table iam_frontend_permission
display_type varchar(20) not null comment '展现类型', display_type varchar(20) not null comment '展现类型',
display_name varchar(100) not null comment '显示名称', display_name varchar(100) not null comment '显示名称',
frontend_code varchar(100) not null comment '前端编码', frontend_code varchar(100) not null comment '前端编码',
api_set varchar(5000) null comment '接口列表', api_set varchar(3000) null comment '接口列表',
sort_id bigint null comment '排序号', sort_id bigint null comment '排序号',
is_deleted tinyint(1) default 0 not null comment '是否删除', is_deleted tinyint(1) default 0 not null comment '是否删除',
create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间', create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间',

View File

@ -70,7 +70,7 @@ create table iam_frontend_permission
display_type varchar(20) not null comment '展现类型', display_type varchar(20) not null comment '展现类型',
display_name varchar(100) not null comment '显示名称', display_name varchar(100) not null comment '显示名称',
frontend_code varchar(100) not null comment '前端编码', frontend_code varchar(100) not null comment '前端编码',
api_set varchar(5000) null comment '接口列表', api_set varchar(3000) null comment '接口列表',
sort_id bigint null comment '排序号', sort_id bigint null comment '排序号',
is_deleted tinyint(1) default 0 not null comment '是否删除', is_deleted tinyint(1) default 0 not null comment '是否删除',
create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间', create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间',

View File

@ -115,7 +115,7 @@ create table ${SCHEMA}.iam_frontend_permission
display_type VARCHAR2(20) not null, display_type VARCHAR2(20) not null,
display_name VARCHAR2(100) not null, display_name VARCHAR2(100) not null,
frontend_code VARCHAR2(100) null, frontend_code VARCHAR2(100) null,
api_set VARCHAR2(5000) null, api_set VARCHAR2(3000) null,
sort_id NUMBER(20) null, sort_id NUMBER(20) null,
is_deleted NUMBER(1) DEFAULT 0 not null, is_deleted NUMBER(1) DEFAULT 0 not null,
create_time timestamp default CURRENT_TIMESTAMP not null, create_time timestamp default CURRENT_TIMESTAMP not null,

View File

@ -111,7 +111,7 @@ create table iam_frontend_permission
display_type varchar(20) not null, display_type varchar(20) not null,
display_name varchar(100) not null, display_name varchar(100) not null,
frontend_code varchar(100) null, frontend_code varchar(100) null,
api_set varchar(5000) null, api_set varchar(3000) null,
sort_id bigint null, sort_id bigint null,
is_deleted BOOLEAN default FALSE not null, is_deleted BOOLEAN default FALSE not null,
create_time timestamp default CURRENT_TIMESTAMP not null, create_time timestamp default CURRENT_TIMESTAMP not null,

View File

@ -115,7 +115,7 @@ create table ${SCHEMA}.iam_frontend_permission
display_type varchar(20) not null, display_type varchar(20) not null,
display_name varchar(100) not null, display_name varchar(100) not null,
frontend_code varchar(100) null, frontend_code varchar(100) null,
api_set varchar(5000) null, api_set varchar(3000) null,
sort_id bigint null, sort_id bigint null,
is_deleted tinyint default 0 not null, is_deleted tinyint default 0 not null,
create_time datetime default CURRENT_TIMESTAMP not null, create_time datetime default CURRENT_TIMESTAMP not null,

View File

@ -91,4 +91,5 @@
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>