diff --git a/web/src/main/java/com/dite/znpt/web/controller/PostController.java b/web/src/main/java/com/dite/znpt/web/controller/PostController.java index f5e0945..7662b1f 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/PostController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/PostController.java @@ -1,10 +1,13 @@ package com.dite.znpt.web.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dite.znpt.domain.PageResult; import com.dite.znpt.domain.Result; +import com.dite.znpt.domain.entity.UserPostEntity; import com.dite.znpt.domain.vo.PostReq; import com.dite.znpt.domain.vo.PostResp; import com.dite.znpt.service.PostService; +import com.dite.znpt.service.UserPostService; import com.dite.znpt.util.ValidationGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,6 +29,9 @@ public class PostController { @Resource private PostService postService; + @Resource + private UserPostService userPostService; + @ApiOperation(value = "分页查询岗位信息列表", httpMethod = "GET") @GetMapping("/page") public PageResult page(@RequestParam(value = "postName", required = false) String postName){ @@ -61,6 +67,7 @@ public class PostController { @ApiOperation(value = "删除岗位信息", httpMethod = "DELETE") @DeleteMapping("/{postId}") public Result remove(@PathVariable String postId){ + userPostService.remove(new QueryWrapper().eq("post_id", postId)); postService.deleteById(postId); return Result.ok(); } diff --git a/web/src/main/java/com/dite/znpt/web/controller/RoleController.java b/web/src/main/java/com/dite/znpt/web/controller/RoleController.java index fb94ef4..3ae82c4 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/RoleController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/RoleController.java @@ -1,7 +1,9 @@ package com.dite.znpt.web.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dite.znpt.domain.PageResult; import com.dite.znpt.domain.Result; +import com.dite.znpt.domain.entity.UserRoleEntity; import com.dite.znpt.domain.vo.RoleMenuReq; import com.dite.znpt.domain.vo.RoleReq; import com.dite.znpt.domain.vo.RoleResp; @@ -73,6 +75,7 @@ public class RoleController { @ApiOperation(value = "删除角色信息", httpMethod = "DELETE") @DeleteMapping("/{roleId}") public Result delete(@PathVariable String roleId){ + userRoleService.remove(new QueryWrapper().eq("role_id", roleId)); roleService.deleteById(roleId); return Result.ok(); } diff --git a/web/src/main/java/com/dite/znpt/web/controller/UserController.java b/web/src/main/java/com/dite/znpt/web/controller/UserController.java index 18bde3a..057e6b5 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/UserController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/UserController.java @@ -1,9 +1,13 @@ package com.dite.znpt.web.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dite.znpt.domain.PageResult; import com.dite.znpt.domain.Result; +import com.dite.znpt.domain.entity.UserPostEntity; +import com.dite.znpt.domain.entity.UserRoleEntity; import com.dite.znpt.domain.vo.*; +import com.dite.znpt.service.UserPostService; import com.dite.znpt.service.UserRoleService; import com.dite.znpt.service.UserService; import com.dite.znpt.util.ValidationGroup; @@ -26,6 +30,8 @@ public class UserController { private UserService userService; @Resource private UserRoleService userRoleService; + @Resource + private UserPostService userPostService; @ApiOperation(value = "分页查询用户信息列表", httpMethod = "GET") @GetMapping("/page") @@ -68,6 +74,8 @@ public class UserController { @ApiOperation(value = "删除用户信息", httpMethod = "DELETE") @DeleteMapping("/{userId}") public Result remove(@PathVariable String userId) { + userRoleService.remove(new QueryWrapper().eq("user_id", userId)); + userPostService.remove(new QueryWrapper().eq("user_id", userId)); userService.deleteById(userId); return Result.ok(); }