From dcbe4f6c41600fdb6825233829090a8cfb3d1063 Mon Sep 17 00:00:00 2001
From: HJK <2169599749@qq.com>
Date: Fri, 18 Nov 2016 15:08:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?long=20=E7=B1=BB=E5=9E=8B=E6=AF=94=E8=BE=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/wangzhixuan/controller/UserController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/wangzhixuan/controller/UserController.java b/src/main/java/com/wangzhixuan/controller/UserController.java
index bd3d01c..7ea96fe 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
-- 
Gitee


From 4396cc9b77454aeab5553ce7e5a503fbf82ad3b9 Mon Sep 17 00:00:00 2001
From: HJK <2169599749@qq.com>
Date: Mon, 21 Nov 2016 14:22:41 +0800
Subject: [PATCH 2/2] update

---
 .../com/wangzhixuan/controller/OrganizationController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/wangzhixuan/controller/OrganizationController.java b/src/main/java/com/wangzhixuan/controller/OrganizationController.java
index 3973f7a..022efcd 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
-- 
Gitee