chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

编译通过，格式化代码。

This commit is contained in:
chenxudong 2025-04-17 17:20:19 +08:00
parent 6c31cd0c42
commit 48ca408ef3
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java
View File

@ -1,13 +1,17 @@
package com.electromagnetic.industry.software.manage.pojo.models; 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.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("ed_role") // 指定表名 @TableName("ed_role") // 指定表名
public class Role extends BaseModel { public class Role extends BaseModel {

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java
View File

@ -7,9 +7,11 @@ import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("ed_role_permission") @TableName("ed_role_permission")
public class RolePermission extends BaseModel { public class RolePermission extends BaseModel {

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
View File

@ -345,9 +345,9 @@ public class UserServiceImpl implements UserService {
if (roleNames != null) { if (roleNames != null) {
for (String roleName : roleNames) { for (String roleName : roleNames) {
LambdaQueryWrapper<Role> roleQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Role> roleQueryWrapper = new LambdaQueryWrapper<>();
roleQueryWrapper.select(Role::getRoleId) roleQueryWrapper.select(Role::getId)
.eq(Role::getRoleName, roleName); .eq(Role::getRoleName, roleName);
String roleId = roleMapper.selectOne(roleQueryWrapper).getRoleId(); String roleId = roleMapper.selectOne(roleQueryWrapper).getId();
UserRole userRole = new UserRole(); UserRole userRole = new UserRole();
userRole.setUserId(userId); userRole.setUserId(userId);

2
electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml
View File

@ -262,7 +262,7 @@
<select id="selectUserRoles" parameterType="String" resultType="String"> <select id="selectUserRoles" parameterType="String" resultType="String">
select r.role_name select r.role_name
from ed_role r from ed_role r
where r.role_id in (select ur.role_id where r.id in (select ur.role_id
from ed_users u from ed_users u
left join ed_user_role ur on u.user_id = ur.user_id left join ed_user_role ur on u.user_id = ur.user_id
where u.user_id = #{userId}) where u.user_id = #{userId})