角色已绑定后不能作废,功能修改
This commit is contained in:
parent
8fe9b3e356
commit
7f38b45246
|
|
@ -32,7 +32,7 @@ public interface RoleMapper extends BaseMapper<Role> {
|
||||||
"LEFT JOIN " +
|
"LEFT JOIN " +
|
||||||
" ed_file_info f ON rp.file_id = f.id " +
|
" ed_file_info f ON rp.file_id = f.id " +
|
||||||
"LEFT JOIN" +
|
"LEFT JOIN" +
|
||||||
" ed_user_role ur ON r.role_id = ur.user_id " +
|
" ed_user_role ur ON r.role_id = ur.role_id " +
|
||||||
"LEFT JOIN" +
|
"LEFT JOIN" +
|
||||||
" ed_users u ON ur.user_id = u.user_id " +
|
" ed_users u ON ur.user_id = u.user_id " +
|
||||||
"WHERE " +
|
"WHERE " +
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ public class PermissionServiceImpl implements PermissionService {
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Boolean> transToMap(List<String> permissionCodes) {
|
public Map<String, Boolean> transToMap(List<String> permissionCodes) {
|
||||||
Map<String, Boolean> result = new HashMap<>();
|
Map<String, Boolean> result = new HashMap<>();
|
||||||
List<String> allCodes = FilePermission.getAllCodes();
|
List<String> allCodes = FilePermission.getAllCodesExcludeView();
|
||||||
for (String code : allCodes) {
|
for (String code : allCodes) {
|
||||||
if (permissionCodes.contains(code)) {
|
if (permissionCodes.contains(code)) {
|
||||||
result.put(code, true);
|
result.put(code, true);
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,17 @@ public enum FilePermission {
|
||||||
return codes;
|
return codes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取所有的code除了view
|
||||||
|
public static List<String> getAllCodesExcludeView() {
|
||||||
|
List<String> codes = new ArrayList<>();
|
||||||
|
for (FilePermission permission : FilePermission.values()) {
|
||||||
|
if (!permission.getCode().equals("view")) {
|
||||||
|
codes.add(permission.getCode());
|
||||||
|
}// 获取每个枚举实例的 code
|
||||||
|
}
|
||||||
|
return codes;
|
||||||
|
}
|
||||||
|
|
||||||
// 获取权限代码
|
// 获取权限代码
|
||||||
public String getCode() {
|
public String getCode() {
|
||||||
return code;
|
return code;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue