diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java index 3632c9f8..4c32366e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java @@ -5,11 +5,13 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Set; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @Getter @Setter +@EqualsAndHashCode(callSuper = true) public class SystemMenuVo extends SystemMenuTb { @ApiModelProperty(value = "菜单角色") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 3cf71083..b584fa88 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -123,6 +123,7 @@ public class SystemRoleService { * * @param args / */ + @Transactional(rollbackFor = Exception.class) public void updateBindMenuById(SystemRoleVo args) { SystemRoleTb role = systemRoleMapper.selectById(args.getId()); checkRoleLevels(role.getLevel()); @@ -142,7 +143,7 @@ public class SystemRoleService { */ @Transactional(rollbackFor = Exception.class) public void deleteRoleByIds(Set ids) { - List roleLevels = systemRoleMapper.selectByIds(ids).stream().map(SystemRoleTb::getLevel).distinct().collect(Collectors.toList()); + List roleLevels = systemRoleMapper.selectByIds(ids).stream().map(SystemRoleTb::getLevel).distinct().toList(); for (Integer roleLevel : roleLevels) { checkRoleLevels(roleLevel); } @@ -270,7 +271,7 @@ public class SystemRoleService { */ private int checkRoleLevels(Integer level) { List levels = systemUserRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream() - .map(SystemRoleTb::getLevel).collect(Collectors.toList()); + .map(SystemRoleTb::getLevel).toList(); int min = Collections.min(levels); if (level != null) { if (level < min) { @@ -282,14 +283,6 @@ public class SystemRoleService { public void exportRoleXlsx(HttpServletResponse response, SystemQueryRoleArgs args) { List systemRoleVos = this.queryRoleByArgs(args); -// KitXlsxExportUtil.exportFile(response, "角色数据", systemRoleVos, SystemRoleExportRowVo.class, (dataObject) -> { -// SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo(); -// rowVo.setName(dataObject.getName()); -// rowVo.setLevel(dataObject.getLevel()); -// rowVo.setDescription(dataObject.getDescription()); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// }); List rowVos = new ArrayList<>(); for (SystemRoleVo dataObject : systemRoleVos) { SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 2ee88f40..bbd4c0ed 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -123,6 +123,7 @@ public class SystemRoleService { * * @param args / */ + @Transactional(rollbackFor = Exception.class) public void updateBindMenuById(SystemRoleVo args) { SystemRoleTb role = systemRoleMapper.selectById(args.getId()); checkRoleLevels(role.getLevel());