From d22f2305e51fdf9d0806728ffc5f3903ae9b7306 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Tue, 8 Oct 2024 10:44:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=86=E9=85=8D=E6=9D=83=E9=99=90,=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E5=B7=B2=E7=BB=8F=E5=88=86?= =?UTF-8?q?=E9=85=8D=E5=A5=BD=E7=9A=84=E6=9D=83=E9=99=90,=E5=85=B6?= =?UTF-8?q?=E5=AE=83=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/dto/system/dept/DeptUpdateDto.java | 2 +- .../rolePower/AssignPowersToRoleDto.java | 27 +++++++++++++++ .../dao/dto/system/rolePower/PowerAddDto.java | 1 - .../dto/system/rolePower/PowerUpdateDto.java | 1 - .../router/AssignRolesToRoutersDto.java | 3 ++ .../dao/pojo/constant/RedisUserConstant.java | 7 ---- .../bunny/dao/pojo/result/ResultCodeEnum.java | 1 + .../cn/bunny/dao/vo/system/user/LoginVo.java | 2 +- .../controller/RolePowerController.java | 13 ++++++-- .../bunny/services/mapper/UserRoleMapper.java | 4 +-- .../filter/NoTokenAuthenticationFilter.java | 2 +- .../filter/TokenLoginFilterService.java | 2 +- .../services/service/RolePowerService.java | 9 +++++ .../service/impl/DeptServiceImpl.java | 11 +++++-- .../service/impl/MenuIconServiceImpl.java | 2 +- .../service/impl/PowerServiceImpl.java | 3 +- .../service/impl/RolePowerServiceImpl.java | 33 ++++++++++++++++--- .../service/impl/RoleServiceImpl.java | 1 + .../service/impl/RouterServiceImpl.java | 5 ++- .../service/impl/UserServiceImpl.java | 6 +++- service/src/main/resources/application.yml | 4 +-- .../main/resources/mapper/RolePowerMapper.xml | 2 +- .../main/resources/mapper/UserRoleMapper.xml | 5 ++- 23 files changed, 110 insertions(+), 36 deletions(-) create mode 100644 dao/src/main/java/cn/bunny/dao/dto/system/rolePower/AssignPowersToRoleDto.java diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/dept/DeptUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/dept/DeptUpdateDto.java index 76b9977..d037103 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/dept/DeptUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/dept/DeptUpdateDto.java @@ -22,7 +22,7 @@ public class DeptUpdateDto { private Long id; @Schema(name = "parentId", title = "父级id") - private String parentId; + private Long parentId; @Schema(name = "managerId", title = "管理者") @NotNull(message = "管理者不能为空") diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/AssignPowersToRoleDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/AssignPowersToRoleDto.java new file mode 100644 index 0000000..fb71b81 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/AssignPowersToRoleDto.java @@ -0,0 +1,27 @@ +package cn.bunny.dao.dto.system.rolePower; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "AssignPowersToRoleDto对象", title = "为角色分配权限表单", description = "为角色分配权限") +public class AssignPowersToRoleDto { + + @Schema(name = "roleIds", title = "角色id") + @NotNull(message = "角色id不能为空") + private Long roleId; + + @Schema(name = "powerIds", title = "权限id列表") + @NotNull(message = "权限id列表不能为空") + private List powerIds; + +} diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java index 5b31719..b689e7f 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java @@ -26,7 +26,6 @@ public class PowerAddDto { private String powerName; @Schema(name = "requestUrl", title = "请求路径") - @NotBlank(message = "请求路径 不能为空") private String requestUrl; } diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java index 1e02b25..6a30389 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java @@ -31,7 +31,6 @@ public class PowerUpdateDto { private String powerName; @Schema(name = "requestUrl", title = "请求路径") - @NotBlank(message = "请求路径 不能为空") private String requestUrl; } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/router/AssignRolesToRoutersDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/router/AssignRolesToRoutersDto.java index e8428ca..10cbd3b 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/router/AssignRolesToRoutersDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/router/AssignRolesToRoutersDto.java @@ -1,6 +1,7 @@ package cn.bunny.dao.dto.system.router; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -16,9 +17,11 @@ import java.util.List; public class AssignRolesToRoutersDto { @Schema(name = "routerId", title = "路由id") + @NotNull(message = "路由id不能为空") private Long routerId; @Schema(name = "roleIds", title = "角色id列表") + @NotNull(message = "角色id列表不能为空") private List roleIds; } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/pojo/constant/RedisUserConstant.java b/dao/src/main/java/cn/bunny/dao/pojo/constant/RedisUserConstant.java index cedfa68..43c3896 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/constant/RedisUserConstant.java +++ b/dao/src/main/java/cn/bunny/dao/pojo/constant/RedisUserConstant.java @@ -24,11 +24,4 @@ public class RedisUserConstant { return ADMIN_EMAIL_CODE_PREFIX + adminUser; } - public static String getUserLoginInfoPrefix(String user) { - return USER_LOGIN_INFO_PREFIX + user; - } - - public static String getUserEmailCodePrefix(String user) { - return USER_EMAIL_CODE_PREFIX + user; - } } diff --git a/dao/src/main/java/cn/bunny/dao/pojo/result/ResultCodeEnum.java b/dao/src/main/java/cn/bunny/dao/pojo/result/ResultCodeEnum.java index 7553a9e..8bfe6da 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/result/ResultCodeEnum.java +++ b/dao/src/main/java/cn/bunny/dao/pojo/result/ResultCodeEnum.java @@ -56,6 +56,7 @@ public enum ResultCodeEnum { URL_ENCODE_ERROR(216, "URL编码失败"), ILLEGAL_CALLBACK_REQUEST_ERROR(217, "非法回调请求"), FETCH_USERINFO_ERROR(219, "获取用户信息失败"), + ILLEGAL_DATA_REQUEST(219, "非法数据请求"), // 无权访问 403 FAIL_REQUEST_NOT_AUTH(403, "用户未认证"), diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java index bcbced2..3d04ec3 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java @@ -48,7 +48,7 @@ public class LoginVo extends BaseVo { private String lastLoginIpAddress; @Schema(name = "status", title = "1:禁用 0:正常") - private Byte status; + private Boolean status; @Schema(name = "token", title = "令牌") private String token; diff --git a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java b/service/src/main/java/cn/bunny/services/controller/RolePowerController.java index aee47dc..456a459 100644 --- a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/RolePowerController.java @@ -1,13 +1,13 @@ package cn.bunny.services.controller; +import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; import cn.bunny.dao.pojo.result.Result; import cn.bunny.services.service.RolePowerService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Mono; import java.util.List; @@ -34,4 +34,11 @@ public class RolePowerController { List voList = rolePowerService.getPowerListByRoleId(id); return Mono.just(Result.success(voList)); } + + @Operation(summary = "为角色分配权限", description = "为角色分配权限") + @PostMapping("assignPowersToRole") + public Mono> assignPowersToRole(@Valid @RequestBody AssignPowersToRoleDto dto) { + rolePowerService.assignPowersToRole(dto); + return Mono.just(Result.success()); + } } diff --git a/service/src/main/java/cn/bunny/services/mapper/UserRoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/UserRoleMapper.java index 341873b..b88cd0c 100644 --- a/service/src/main/java/cn/bunny/services/mapper/UserRoleMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/UserRoleMapper.java @@ -20,9 +20,9 @@ public interface UserRoleMapper extends BaseMapper { /** * * 删除这个用户id下所有的角色信息 * - * @param userId 用户id + * @param userIds 用户id */ - void deleteBatchIdsByUserIdsWithPhysics(List userId); + void deleteBatchIdsByUserIdsWithPhysics(List userIds); /** * * 根据角色id删除用户和角色 diff --git a/service/src/main/java/cn/bunny/services/security/filter/NoTokenAuthenticationFilter.java b/service/src/main/java/cn/bunny/services/security/filter/NoTokenAuthenticationFilter.java index cd81337..c290663 100644 --- a/service/src/main/java/cn/bunny/services/security/filter/NoTokenAuthenticationFilter.java +++ b/service/src/main/java/cn/bunny/services/security/filter/NoTokenAuthenticationFilter.java @@ -48,7 +48,7 @@ public class NoTokenAuthenticationFilter extends OncePerRequestFilter { LoginVo loginVo = JSON.parseObject(JSON.toJSONString(loginVoObject), LoginVo.class); // 判断用户是否禁用 - if (loginVo != null && loginVo.getStatus() == 1) { + if (loginVo != null && loginVo.getStatus()) { ResponseUtil.out(response, Result.error(ResultCodeEnum.FAIL_NO_ACCESS_DENIED_USER_LOCKED)); return; } diff --git a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java index 431b7b9..080d74c 100644 --- a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java +++ b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java @@ -86,7 +86,7 @@ public class TokenLoginFilterService extends UsernamePasswordAuthenticationFilte LoginVo loginVo = customUserDetailsService.login(loginDto); // 判断用户是否禁用 - if (loginVo.getStatus() == 1) { + if (loginVo.getStatus()) { out(response, Result.error(ResultCodeEnum.FAIL_NO_ACCESS_DENIED_USER_LOCKED)); return; } diff --git a/service/src/main/java/cn/bunny/services/service/RolePowerService.java b/service/src/main/java/cn/bunny/services/service/RolePowerService.java index 357de77..c96ac0e 100644 --- a/service/src/main/java/cn/bunny/services/service/RolePowerService.java +++ b/service/src/main/java/cn/bunny/services/service/RolePowerService.java @@ -1,7 +1,9 @@ package cn.bunny.services.service; +import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; import cn.bunny.dao.entity.system.RolePower; import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.validation.Valid; import java.util.List; @@ -22,4 +24,11 @@ public interface RolePowerService extends IService { * @return 已选择的权限列表 */ List getPowerListByRoleId(Long id); + + /** + * * 为角色分配权限 + * + * @param powerIds 权限id + */ + void assignPowersToRole(@Valid AssignPowersToRoleDto powerIds); } diff --git a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java index f35ee4e..d268699 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java @@ -1,10 +1,12 @@ package cn.bunny.services.service.impl; +import cn.bunny.common.service.exception.BunnyException; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; import cn.bunny.dao.dto.system.dept.DeptUpdateDto; import cn.bunny.dao.entity.system.Dept; import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.pojo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.dept.DeptVo; import cn.bunny.services.mapper.DeptMapper; import cn.bunny.services.mapper.UserDeptMapper; @@ -12,7 +14,6 @@ import cn.bunny.services.service.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -73,7 +74,8 @@ public class DeptServiceImpl extends ServiceImpl implements De * @param dto 部门添加 */ @Override - public void addDept(@Valid DeptAddDto dto) { + public void addDept(DeptAddDto dto) { + // 整理管理者人员 String mangerList = dto.getManager().stream().map(String::trim).collect(Collectors.joining(",")); // 保存数据 @@ -90,8 +92,10 @@ public class DeptServiceImpl extends ServiceImpl implements De * @param dto 部门更新 */ @Override - public void updateDept(@Valid DeptUpdateDto dto) { + public void updateDept(DeptUpdateDto dto) { + // 判断所更新的部门是否存在 String mangerList = dto.getManager().stream().map(String::trim).collect(Collectors.joining(",")); + if (dto.getId().equals(dto.getParentId())) throw new BunnyException(ResultCodeEnum.ILLEGAL_DATA_REQUEST); // 更新内容 Dept dept = new Dept(); @@ -110,6 +114,7 @@ public class DeptServiceImpl extends ServiceImpl implements De public void deleteDept(List ids) { // 删除当前部门 baseMapper.deleteBatchIdsWithPhysics(ids); + // 删除用户部门关联 userDeptMapper.deleteBatchIdsByDeptIdWithPhysics(ids); } diff --git a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java index 6555448..3e9d18f 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java @@ -63,7 +63,7 @@ public class MenuIconServiceImpl extends ServiceImpl i * @param dto 系统菜单图标添加 */ @Override - public void addMenuIcon(@Valid MenuIconAddDto dto) { + public void addMenuIcon(MenuIconAddDto dto) { // 保存数据 MenuIcon menuIcon = new MenuIcon(); BeanUtils.copyProperties(dto, menuIcon); diff --git a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java index 6cbf274..e0cfb82 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java @@ -96,7 +96,8 @@ public class PowerServiceImpl extends ServiceImpl implements Long id = dto.getId(); List powerList = list(Wrappers.lambdaQuery().eq(Power::getId, id)); if (powerList.isEmpty()) throw new BunnyException(ResultCodeEnum.DATA_NOT_EXIST); - + if (dto.getId().equals(dto.getParentId())) throw new BunnyException(ResultCodeEnum.ILLEGAL_DATA_REQUEST); + // 更新内容 Power power = new Power(); BeanUtils.copyProperties(dto, power); diff --git a/service/src/main/java/cn/bunny/services/service/impl/RolePowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RolePowerServiceImpl.java index 30deea1..89392aa 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RolePowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RolePowerServiceImpl.java @@ -1,11 +1,12 @@ package cn.bunny.services.service.impl; +import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; import cn.bunny.dao.entity.system.RolePower; import cn.bunny.services.mapper.RolePowerMapper; import cn.bunny.services.service.RolePowerService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -18,11 +19,9 @@ import java.util.List; * @since 2024-09-26 */ @Service +@Transactional public class RolePowerServiceImpl extends ServiceImpl implements RolePowerService { - @Autowired - private RolePowerMapper rolePowerMapper; - /** * * 根据角色id获取权限内容 * @@ -31,7 +30,31 @@ public class RolePowerServiceImpl extends ServiceImpl getPowerListByRoleId(Long id) { - List rolePowerList = rolePowerMapper.selectPowerListByRoleId(id); + List rolePowerList = baseMapper.selectPowerListByRoleId(id); return rolePowerList.stream().map(rolePower -> rolePower.getPowerId().toString()).toList(); } + + /** + * * 为角色分配权限 + * + * @param dto 为角色分配权限表单 + */ + @Override + public void assignPowersToRole(AssignPowersToRoleDto dto) { + List powerIds = dto.getPowerIds(); + Long roleId = dto.getRoleId(); + + // 删除所有权限 + baseMapper.deleteBatchPowerIdsWithPhysics(powerIds); + + // 保存分配数据 + List rolePowerList = powerIds.stream().map(powerId -> { + RolePower rolePower = new RolePower(); + rolePower.setRoleId(roleId); + rolePower.setPowerId(powerId); + return rolePower; + }).toList(); + + saveBatch(rolePowerList); + } } diff --git a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java index 795b733..872d8af 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java @@ -95,6 +95,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro */ @Override public void updateRole(@Valid RoleUpdateDto dto) { + // 查询更新的角色是否存在 List roleList = list(Wrappers.lambdaQuery().eq(Role::getId, dto.getId())); if (roleList.isEmpty()) throw new BunnyException(ResultCodeEnum.DATA_NOT_EXIST); diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java index 44c6751..4268e30 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java @@ -187,9 +187,8 @@ public class RouterServiceImpl extends ServiceImpl impleme public void updateMenu(RouterUpdateDto dto) { Long id = dto.getId(); Router router = getOne(Wrappers.lambdaQuery().eq(Router::getId, id)); - if (router == null) { - throw new BunnyException(ResultCodeEnum.DATA_NOT_EXIST); - } + if (router == null) throw new BunnyException(ResultCodeEnum.DATA_NOT_EXIST); + if (dto.getId().equals(dto.getParentId())) throw new BunnyException(ResultCodeEnum.ILLEGAL_DATA_REQUEST); router = new Router(); BeanUtils.copyProperties(dto, router); diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java index ae55081..0d63594 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java @@ -306,7 +306,11 @@ public class UserServiceImpl extends ServiceImpl implemen * @param dto 用户信息更新 */ @Override - public void updateAdminUser(@Valid AdminUserUpdateDto dto) { + public void updateAdminUser(AdminUserUpdateDto dto) { + // 判断更新内容是否存在 + List adminUserList = list(Wrappers.lambdaQuery().eq(AdminUser::getId, dto.getId())); + if (adminUserList.isEmpty()) throw new BunnyException(ResultCodeEnum.DATA_NOT_EXIST); + AdminUser adminUser = new AdminUser(); BeanUtils.copyProperties(dto, adminUser); updateById(adminUser); diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index 1fa718c..96a5dfe 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -77,8 +77,8 @@ mybatis-plus: global-config: db-config: logic-delete-field: isDelete -# configuration: -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 logging: level: diff --git a/service/src/main/resources/mapper/RolePowerMapper.xml b/service/src/main/resources/mapper/RolePowerMapper.xml index 22cf448..5e1b774 100644 --- a/service/src/main/resources/mapper/RolePowerMapper.xml +++ b/service/src/main/resources/mapper/RolePowerMapper.xml @@ -24,7 +24,7 @@ delete from sys_role_power where power_id in - + #{id} diff --git a/service/src/main/resources/mapper/UserRoleMapper.xml b/service/src/main/resources/mapper/UserRoleMapper.xml index 5aa0f49..c43ee3b 100644 --- a/service/src/main/resources/mapper/UserRoleMapper.xml +++ b/service/src/main/resources/mapper/UserRoleMapper.xml @@ -23,7 +23,10 @@ delete from sys_user_role - where user_id = #{userId} + where user_id in + + #{id} +