From 48ca408ef34ee8647b53a95f81be80b54e69cab5 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Thu, 17 Apr 2025 17:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=80=9A=E8=BF=87=EF=BC=8C?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/manage/pojo/models/Role.java | 8 ++++++-- .../software/manage/pojo/models/RolePermission.java | 4 +++- .../service/serviceimpl/RolePermissionServiceImpl.java | 4 ++-- .../manage/service/serviceimpl/RoleServiceImpl.java | 4 ++-- .../manage/service/serviceimpl/UserServiceImpl.java | 4 ++-- .../src/main/resources/sqlmapper/RolePermissionMapper.xml | 2 +- .../src/main/resources/sqlmapper/UserMapper.xml | 2 +- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java index a531f2d..d4d4320 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java @@ -1,16 +1,20 @@ package com.electromagnetic.industry.software.manage.pojo.models; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; +@EqualsAndHashCode(callSuper = true) @Data @TableName("ed_role") // 指定表名 -public class Role extends BaseModel{ +public class Role extends BaseModel { @TableId(value = "id") private String id; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java index f2881d3..7d60b03 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java @@ -7,12 +7,14 @@ import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; +@EqualsAndHashCode(callSuper = true) @Data @TableName("ed_role_permission") -public class RolePermission extends BaseModel{ +public class RolePermission extends BaseModel { /** * 主键id diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java index 1380787..b582427 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java @@ -75,7 +75,7 @@ public class RolePermissionServiceImpl extends ServiceImpl() .set(RolePermission::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code) .in(RolePermission::getId, idsToDisable)); - } + } } /** @@ -90,7 +90,7 @@ public class RolePermissionServiceImpl extends ServiceImpl() .eq(RolePermission::getFileId, rp.getFileId()) - .eq(RolePermission::getRoleId,rp.getRoleId()) + .eq(RolePermission::getRoleId, rp.getRoleId()) .eq(RolePermission::getPermissionCode, rp.getPermissionCode())); if (exist != null) { rp.setId(exist.getId()); // 赋值已有 ID，避免重复插入 diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java index 016e2a6..62efa95 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java @@ -399,7 +399,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro /** * 失效角色权限关系 */ - private void disableRolePermission (String roleId) { + private void disableRolePermission(String roleId) { // 失效旧权限信息 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(RolePermission::getRoleId, roleId); @@ -410,7 +410,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro /** * 失效角色用户关系 */ - private void disableUserRole (String roleId) { + private void disableUserRole(String roleId) { } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java index d061230..4728738 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java @@ -345,9 +345,9 @@ public class UserServiceImpl implements UserService { if (roleNames != null) { for (String roleName : roleNames) { LambdaQueryWrapper roleQueryWrapper = new LambdaQueryWrapper<>(); - roleQueryWrapper.select(Role::getRoleId) + roleQueryWrapper.select(Role::getId) .eq(Role::getRoleName, roleName); - String roleId = roleMapper.selectOne(roleQueryWrapper).getRoleId(); + String roleId = roleMapper.selectOne(roleQueryWrapper).getId(); UserRole userRole = new UserRole(); userRole.setUserId(userId); diff --git a/electrmangnetic/src/main/resources/sqlmapper/RolePermissionMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/RolePermissionMapper.xml index 2746d9e..fcce56d 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/RolePermissionMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/RolePermissionMapper.xml @@ -14,7 +14,7 @@ resultMap="RolePermissionMap"> SELECT f.parent_id as file_id, rp.permission_code, rp.role_id FROM ed_role_permission rp - JOIN ed_file_info f ON rp.file_id = f.id AND rp.effect_flag = #{effectFlag} + JOIN ed_file_info f ON rp.file_id = f.id AND rp.effect_flag = #{effectFlag} WHERE f.parent_id = #{fileId} AND f.data_status = #{dataStatus} AND f.effect_flag = #{effectFlag} diff --git a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml index 0864be4..a21d996 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml @@ -262,7 +262,7 @@