From c010df11e8d378c2986264726919bd7ecac94cab Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Sat, 7 May 2016 10:25:37 +0800 Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E9=83=A8=E9=97=A8=20=E8=A7=92=E8=89=B2=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/DepartmentsController.java | 11 ++++++++++- .../platform/operate/web/controller/RolesController.java | 12 +++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java index ef50a00..e368691 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -93,7 +93,15 @@ public class DepartmentsController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(response,"该部门不存在"); return; } - + if(!departments.getName().equals(name)) { + DepartmentsQuery departmentsQuery = new DepartmentsQuery(); + departments.setYn(YnEnums.YES.getId()); + departmentsQuery.setName(name); + if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) { + ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在"); + return; + } + } pid = pid == null ? 0 : pid; departments.setParentId(pid); @@ -137,6 +145,7 @@ public class DepartmentsController extends BaseController { } DepartmentsQuery departmentsQuery = new DepartmentsQuery(); departmentsQuery.setName(name); + departmentsQuery.setYn(YnEnums.YES.getId()); if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) { ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在"); return; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 119dfeb..fe3e399 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -235,10 +235,20 @@ public class RolesController extends BaseController { } Roles roles = rolesService.getRoles(id); if (roles==null){ - new BusinessException("", "根据id获取信息不存在."); + new BusinessException("", "角色信息不存在."); return; } + if(!roles.getName().equals(name)) { + RolesQuery rolesQuery = new RolesQuery(); + rolesQuery.setYn(YnEnums.YES.getId()); + rolesQuery.setName(name); + if(0 < rolesService.queryRolesCount(rolesQuery)) { + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); + return; + } + } + roles.setName(name); roles.setEnable(enable); roles.setRemarks(remarks); -- 1.8.3.1