diff --git a/src/main/java/com/wangzhixuan/controller/OrganizationController.java b/src/main/java/com/wangzhixuan/controller/OrganizationController.java index 3973f7a7493985bba4e6e6a41c7f75e400c1260d..022efcdf1503b9823029b78c309bb22b88d3d5ca 100644 --- a/src/main/java/com/wangzhixuan/controller/OrganizationController.java +++ b/src/main/java/com/wangzhixuan/controller/OrganizationController.java @@ -116,7 +116,7 @@ public class OrganizationController extends BaseController { @RequestMapping("/delete") @ResponseBody public Object delete(Long id) { - organizationService.selectById(id); + organizationService.deleteById(id); return renderSuccess("删除成功!"); } -} +} \ No newline at end of file diff --git a/src/main/java/com/wangzhixuan/controller/UserController.java b/src/main/java/com/wangzhixuan/controller/UserController.java index bd3d01c39813050aa9def78bad256e5a2e557123..7ea96fe7f60e328f858ee666e971b8d2d2ba8e03 100644 --- a/src/main/java/com/wangzhixuan/controller/UserController.java +++ b/src/main/java/com/wangzhixuan/controller/UserController.java @@ -135,7 +135,7 @@ public class UserController extends BaseController { @ResponseBody public Object edit(UserVo userVo) { User user = userService.selectByLoginName(userVo.getLoginName()); - if (user != null && user.getId() != userVo.getId()) { + if (user != null && user.getId().intValue() != userVo.getId().intValue()) { return renderError("用户名已存在!"); } if (StringUtils.isNotBlank(userVo.getPassword())) { @@ -185,4 +185,4 @@ public class UserController extends BaseController { userService.deleteUserById(id); return renderSuccess("删除成功!"); } -} +} \ No newline at end of file