|
|
@@ -243,6 +243,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
// 新增角色信息
|
|
|
role.setDelFlag(0);
|
|
|
roleMapper.insertRole(role);
|
|
|
+ loadingRoleCache();
|
|
|
return insertRoleMenu(role);
|
|
|
}
|
|
|
|
|
|
@@ -265,6 +266,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
roleMapper.updateRole(role);
|
|
|
// 删除角色与菜单关联
|
|
|
roleMenuMapper.deleteRoleMenuByRoleId(role.getId());
|
|
|
+ loadingRoleCache();
|
|
|
return insertRoleMenu(role);
|
|
|
}
|
|
|
|
|
|
@@ -292,6 +294,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
roleMapper.updateRole(role);
|
|
|
// 删除角色与机构关联
|
|
|
roleDeptMapper.deleteRoleDeptByRoleId(role.getId());
|
|
|
+ loadingRoleCache();
|
|
|
// 新增角色和机构信息(数据权限)
|
|
|
return insertRoleDept(role);
|
|
|
}
|
|
|
@@ -377,7 +380,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
roleMenuMapper.deleteRoleMenu(roleIds);
|
|
|
// 删除角色与机构关联
|
|
|
roleDeptMapper.deleteRoleDept(roleIds);
|
|
|
- return roleMapper.deleteRoleByIds(roleIds);
|
|
|
+
|
|
|
+ int count= roleMapper.deleteRoleByIds(roleIds);
|
|
|
+ loadingRoleCache();
|
|
|
+ return count;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -471,6 +477,16 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
if (sysRole.getRoleName().equals("超级管理员")) {
|
|
|
continue;
|
|
|
}
|
|
|
+ // 删除的角色
|
|
|
+ if(sysRole.getDelFlag()==2)
|
|
|
+ {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ // 停用的角色
|
|
|
+// if(sysRole.getStatus()==1)
|
|
|
+// {
|
|
|
+// continue;
|
|
|
+// }
|
|
|
list.add(sysRole);
|
|
|
}
|
|
|
clearRoleCache();
|