czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

权限修改

This commit is contained in:
张松 2025-05-26 14:11:38 +08:00
parent 4f86e6b44b
commit fe4fcd82f1
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cash-common/cash-common-service/src/main/java/com/czg/account/dto/role/RoleAddDTO.java
View File

@ -11,9 +11,14 @@ public record RoleAddDTO(
String name, String name,
// 角色级别 // 角色级别
Integer level, Integer level,
// 菜单id /**
@NotEmpty(message = "菜单id不能为空") * 管理员菜单id
List<Long> menuIdList, */
List<Long> adminMenuIdList,
/**
* 收银机菜单id
*/
List<Long> cashMenuIdList,
// 描述 // 描述
String description String description
) { ) {

10
cash-common/cash-common-service/src/main/java/com/czg/account/dto/role/RoleEditDTO.java
View File

@ -20,8 +20,14 @@ public class RoleEditDTO {
// 角色等级 // 角色等级
private Integer level; private Integer level;
// 菜单id // 菜单id
@NotNull /**
private List<Long> menuIdList; * 管理员菜单id
*/
List<Long> adminMenuIdList;
/**
* 收银机菜单id
*/
List<Long> cashMenuIdList;
// 描述 // 描述
private String description; private String description;
} }

18
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
View File

@ -240,7 +240,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
sysRole.setCreateTime(DateUtil.date().toLocalDateTime()); sysRole.setCreateTime(DateUtil.date().toLocalDateTime());
boolean save = save(sysRole); boolean save = save(sysRole);
if (save) { if (save) {
return addMenu(sysRole.getId(), roleAddDTO.menuIdList(), true); if (roleAddDTO.adminMenuIdList() != null && !roleAddDTO.adminMenuIdList().isEmpty()) {
addMenu(sysRole.getId(), roleAddDTO.adminMenuIdList(), true);
}
if (roleAddDTO.cashMenuIdList() != null && !roleAddDTO.cashMenuIdList().isEmpty()) {
addMenu(sysRole.getId(), roleAddDTO.cashMenuIdList(), false);
}
} }
throw new ApiNotPrintException("保存失败"); throw new ApiNotPrintException("保存失败");
@ -264,8 +270,16 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
boolean b = updateById(role); boolean b = updateById(role);
if (b) { if (b) {
sysRolesMenusService.updateChain().eq(SysRolesMenus::getRoleId, role.getId()).remove(); sysRolesMenusService.updateChain().eq(SysRolesMenus::getRoleId, role.getId()).remove();
return addMenu(role.getId(), roleEditDTO.getMenuIdList(), true);
if (roleEditDTO.getAdminMenuIdList() != null && !roleEditDTO.getAdminMenuIdList().isEmpty()) {
addMenu(role.getId(), roleEditDTO.getAdminMenuIdList(), true);
} }
if (roleEditDTO.getCashMenuIdList() != null && !roleEditDTO.getCashMenuIdList().isEmpty()) {
addMenu(role.getId(), roleEditDTO.getCashMenuIdList(), false);
}
return true;
}
throw new ApiNotPrintException("保存失败"); throw new ApiNotPrintException("保存失败");
} }
} }