diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index 21cf30c..60c64af 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -101,19 +101,6 @@ public class UserController { @DeleteMapping // @SaCheckPermission("user:del") public ResponseEntity delete(@RequestBody Set ids) { - for (String id : ids) { - /* Integer currentLevel = Collections.min(roleService.findByUsersId(StpUtil.getLoginIdAsLong()).stream().map(Role::getLevel).collect(Collectors.toList())); - Integer optLevel = Collections.min(roleService.findByUsersId(id).stream().map(Role::getLevel).collect(Collectors.toList())); - if (currentLevel > optLevel) { - throw new BadRequestException("角色权限不足,不能删除:" + userService.findById(id).getUsername()); - }*/ - // 删除缓存信息 -// User userDto = userService.findById(id); -// redisUtils.del("data::user:" + userDto.getUser_id()); -// redisUtils.del("menu::user:" + userDto.getUser_id()); -// redisUtils.del("role::auth:" + userDto.getUser_id()); -// redisUtils.del("user::username:" + userDto.getUsername()); - } userService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue index 1287b32..dd5bae1 100644 --- a/nladmin-ui/src/views/system/user/index.vue +++ b/nladmin-ui/src/views/system/user/index.vue @@ -352,7 +352,7 @@ export default { name: 'User', components: { Treeselect, crudOperation, rrOperation, udOperation, pagination }, cruds() { - return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', idField: 'userId', url: 'api/users', crudMethod: { ...crudUser }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典