Commit 07386048 authored by 王蔡翾's avatar 王蔡翾
Browse files

角色和权限

parent d41b12c3
......@@ -15,4 +15,7 @@ public class SysRolePermissionVO extends SysRolePermissionEntity {
@ApiModelProperty("权限路径")
private String path;
@ApiModelProperty("parentId")
private Integer parentId;
}
......@@ -27,7 +27,7 @@ public class SysPermissionImpl extends ServiceImpl<SysPermissionMapper, SysPermi
// 2. 构建树形结构
List<SysPermissionVO> result = new ArrayList<>();
for (SysPermissionVO permission : sysPermissionVOList) {
if (StringUtils.isEmpty(Collections.singleton(permission.getParentId()))) {
if (permission.getParentId() == null) {
// 顶级节点
result.add(permission);
} else {
......
......@@ -87,9 +87,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
//查看用户扩展信息
UserExtend userExtendOld = userExtendService.getbyUserId(user.getId());
//保存用户扩展信息
userExtend.setId(userExtendOld.getId());
userExtend.setUserId(userExtendOld.getUserId());
userExtendService.saveOrUpdate(userExtend);
if (userExtendOld != null) {
userExtend.setId(userExtendOld.getId());
userExtend.setUserId(userExtendOld.getUserId());
userExtendService.saveOrUpdate(userExtend);
}
}
}
......
......@@ -8,7 +8,8 @@
srp.role_id as roleId,
srp.permission_id as permissionId,
sp.name as permissionName,
sp.path as path
sp.path as path,
sp.parent_id as parentId
from sys_role_permission srp
left join sys_permission sp
on sp.id = srp.permission_id
......@@ -16,7 +17,7 @@
</select>
<delete id="deleteByRoleId" parameterType="java.lang.Boolean">
<delete id="deleteByRoleId" parameterType="java.lang.Integer">
DELETE FROM sys_role_permission WHERE role_id = #{roleId}
</delete>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment