1. 修复bug

topo_dev
xueqingkun 9 months ago
parent 7496be7d81
commit 8240b82bc8

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
@Tag(name = "用户角色管理") @Tag(name = "用户角色管理")
@RestController @RestController
@RequestMapping("/roleManage") @RequestMapping("/role")
@RequiredArgsConstructor @RequiredArgsConstructor
public class RoleController { public class RoleController {
@ -26,8 +26,9 @@ public class RoleController {
@Operation(summary = "修改角色") @Operation(summary = "修改角色")
@PostMapping("/update") @PostMapping("/update")
public void updateRole(@RequestBody RoleDTO roleDTO) { public R<?> updateRole(@RequestBody RoleDTO roleDTO) {
roleService.updateRole(roleDTO); roleService.updateRole(roleDTO);
return R.ok();
} }
@Operation(summary = "删除角色") @Operation(summary = "删除角色")

@ -36,14 +36,16 @@ public class UserController {
@Operation(summary = "修改用户信息") @Operation(summary = "修改用户信息")
@PostMapping("/update") @PostMapping("/update")
public void updateUser(@RequestBody UserInfoReqVo userInfoReqVo) { public R<?> updateUser(@RequestBody UserInfoReqVo userInfoReqVo) {
userService.updateUserInfo(userInfoReqVo); userService.updateUserInfo(userInfoReqVo);
return R.ok();
} }
@Operation(summary = "修改用户状态") @Operation(summary = "修改用户状态")
@PostMapping("/updateUserStatus") @PostMapping("/updateUserStatus")
public void updateUserStatus(@RequestBody UserStatusReqVo userStatusReqVo) { public R<?> updateUserStatus(@RequestBody UserStatusReqVo userStatusReqVo) {
userService.updateUserStatus(userStatusReqVo); userService.updateUserStatus(userStatusReqVo);
return R.ok();
} }
@Operation(summary = "删除用户信息") @Operation(summary = "删除用户信息")

@ -2,6 +2,7 @@ package com.supervision.police.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.supervision.police.domain.SystemRoleMenuRelation; import com.supervision.police.domain.SystemRoleMenuRelation;
import com.supervision.police.domain.SystemUserRoleRelation; import com.supervision.police.domain.SystemUserRoleRelation;
@ -27,6 +28,9 @@ public class SystemRoleMenuRelationServiceImpl extends ServiceImpl<SystemRoleMen
public void updateRoleMenu(String roleId, List<String> menuIds) { public void updateRoleMenu(String roleId, List<String> menuIds) {
Assert.notEmpty(roleId, "角色id不能为空"); Assert.notEmpty(roleId, "角色id不能为空");
// 清除角色菜单关联数据
deleteRoleMenu(roleId);
if (CollUtil.isNotEmpty(menuIds)){ if (CollUtil.isNotEmpty(menuIds)){
List<SystemRoleMenuRelation> list = menuIds.stream().map(menuId -> new SystemRoleMenuRelation(roleId, menuId)).toList(); List<SystemRoleMenuRelation> list = menuIds.stream().map(menuId -> new SystemRoleMenuRelation(roleId, menuId)).toList();
list.forEach(super::save); list.forEach(super::save);
@ -35,7 +39,7 @@ public class SystemRoleMenuRelationServiceImpl extends ServiceImpl<SystemRoleMen
@Override @Override
public void deleteRoleMenu(String roleId) { public void deleteRoleMenu(String roleId) {
super.remove(lambdaQuery().eq(SystemRoleMenuRelation::getRoleId, roleId)); super.remove(new LambdaQueryWrapper<SystemRoleMenuRelation>().eq(SystemRoleMenuRelation::getRoleId, roleId));
} }
@Override @Override

Loading…
Cancel
Save