From 700b82d2a85191d3e4201fd092b80329f42cd05a Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 18 May 2016 15:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/RolesController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 c38b5d4..ad837da 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 @@ -240,6 +240,19 @@ public class RolesController extends BaseController { new BusinessException("", "角色信息不存在."); return; } + //如果是禁用，再判断状态是否一样 + if ("2".equals(enable+"")&&!enable.equals(roles.getEnable())){ + //如果有数据不能删除 + UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); + userRoleMapsQuery.setRoleId(id); + userRoleMapsQuery.setYn(YnEnums.YES.getId()); + Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery); + if(count > 0) { + ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据，不能删除"); + return; + } + } + if (!roles.getName().equals(name)) { RolesQuery rolesQuery = new RolesQuery(); -- 1.8.3.1