新增不能删除超级管理员用户和角色

src/main/java/com/stylefeng/guns/common/constant/Const.java

@@ -18,4 +18,14 @@ public interface Const {
      */
      */
     String ADMIN_NAME = "administrator";
     String ADMIN_NAME = "administrator";
 
 
+    /**
+     * 管理员id
+     */
+    Integer ADMIN_ID = 1;
+
+    /**
+     * 超级管理员角色id
+     */
+    Integer ADMIN_ROLE_ID = 1;
+
 }
 }

src/main/java/com/stylefeng/guns/common/exception/BizExceptionEnum.java

@@ -29,6 +29,9 @@ public enum BizExceptionEnum {
 	NO_PERMITION(405, "权限异常"),
 	NO_PERMITION(405, "权限异常"),
 	REQUEST_INVALIDATE(400,"请求数据格式不正确"),
 	REQUEST_INVALIDATE(400,"请求数据格式不正确"),
 	INVALID_KAPTCHA(400,"验证码不正确"),
 	INVALID_KAPTCHA(400,"验证码不正确"),
+	CANT_DELETE_ADMIN(600,"不能删除超级管理员"),
+	CANT_FREEZE_ADMIN(600,"不能冻结超级管理员"),
+	CANT_CHANGE_ADMIN(600,"不能修改超级管理员角色"),
 
 
 	/**
 	/**
 	 * 账户问题
 	 * 账户问题

src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java

@@ -160,6 +160,11 @@ public class RoleController extends BaseController {
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
         }
         }
 
 
+        //不能删除超级管理员角色
+        if(roleId.equals(Const.ADMIN_ROLE_ID)){
+            throw new BussinessException(BizExceptionEnum.CANT_DELETE_ADMIN);
+        }
+
         //缓存被删除的角色名称
         //缓存被删除的角色名称
         LogObjectHolder.me().set(ConstantFactory.me().getSingleRoleName(roleId));
         LogObjectHolder.me().set(ConstantFactory.me().getSingleRoleName(roleId));
 
 

src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java

@@ -225,6 +225,10 @@ public class UserMgrController extends BaseController {
         if (ToolUtil.isEmpty(userId)) {
         if (ToolUtil.isEmpty(userId)) {
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
         }
         }
+        //不能删除超级管理员
+        if(userId.equals(Const.ADMIN_ID)){
+            throw new BussinessException(BizExceptionEnum.CANT_DELETE_ADMIN);
+        }
         this.managerDao.setStatus(userId, ManagerStatus.DELETED.getCode());
         this.managerDao.setStatus(userId, ManagerStatus.DELETED.getCode());
         return SUCCESS_TIP;
         return SUCCESS_TIP;
     }
     }
@@ -270,6 +274,10 @@ public class UserMgrController extends BaseController {
         if (ToolUtil.isEmpty(userId)) {
         if (ToolUtil.isEmpty(userId)) {
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
         }
         }
+        //不能冻结超级管理员
+        if(userId.equals(Const.ADMIN_ID)){
+            throw new BussinessException(BizExceptionEnum.CANT_FREEZE_ADMIN);
+        }
         this.managerDao.setStatus(userId, ManagerStatus.FREEZED.getCode());
         this.managerDao.setStatus(userId, ManagerStatus.FREEZED.getCode());
         return SUCCESS_TIP;
         return SUCCESS_TIP;
     }
     }
@@ -300,6 +308,10 @@ public class UserMgrController extends BaseController {
         if (ToolUtil.isOneEmpty(userId, roleIds)) {
         if (ToolUtil.isOneEmpty(userId, roleIds)) {
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
             throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
         }
         }
+        //不能修改超级管理员
+        if(userId.equals(Const.ADMIN_ID)){
+            throw new BussinessException(BizExceptionEnum.CANT_CHANGE_ADMIN);
+        }
         this.managerDao.setRoles(userId, roleIds);
         this.managerDao.setRoles(userId, roleIds);
         return SUCCESS_TIP;
         return SUCCESS_TIP;
     }
     }

src/main/resources/gunsTemplate/page.js.btl

@@ -73,7 +73,7 @@ ${context.bizEnBigName}.delete = function () {
             Feng.success("删除成功!");
             Feng.success("删除成功!");
             ${context.bizEnBigName}.table.refresh();
             ${context.bizEnBigName}.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("删除失败!");
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("${context.bizEnName}Id",this.seItem.id);
         ajax.set("${context.bizEnName}Id",this.seItem.id);
         ajax.start();
         ajax.start();

src/main/webapp/static/modular/system/dept/dept.js

@@ -77,7 +77,7 @@ Dept.delete = function () {
             Feng.success("删除成功!");
             Feng.success("删除成功!");
             Dept.table.refresh();
             Dept.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("删除失败!");
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("deptId",this.seItem.id);
         ajax.set("deptId",this.seItem.id);
         ajax.start();
         ajax.start();

src/main/webapp/static/modular/system/dict/dict.js

@@ -75,7 +75,7 @@ Dict.delete = function () {
             Feng.success("删除成功!");
             Feng.success("删除成功!");
             Dict.table.refresh();
             Dict.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("删除失败!");
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("dictId", this.seItem.id);
         ajax.set("dictId", this.seItem.id);
         ajax.start();
         ajax.start();

src/main/webapp/static/modular/system/menu/menu.js

@@ -81,7 +81,7 @@ Menu.delMenu = function () {
             Feng.success("删除成功!");
             Feng.success("删除成功!");
             Menu.table.refresh();
             Menu.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("删除失败!");
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("menuId", this.seItem.id);
         ajax.set("menuId", this.seItem.id);
         ajax.start();
         ajax.start();

src/main/webapp/static/modular/system/notice/notice.js

@@ -77,7 +77,7 @@ Notice.delete = function () {
             Feng.success("删除成功!");
             Feng.success("删除成功!");
             Notice.table.refresh();
             Notice.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("删除失败!");
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("noticeId", this.seItem.id);
         ajax.set("noticeId", this.seItem.id);
         ajax.start();
         ajax.start();

src/main/webapp/static/modular/system/role/role.js

@@ -78,7 +78,7 @@ Role.delRole = function () {
             Feng.success("删除成功!");
             Feng.success("删除成功!");
             Role.table.refresh();
             Role.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("删除失败!");
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("roleId", this.seItem.id);
         ajax.set("roleId", this.seItem.id);
         ajax.start();
         ajax.start();

src/main/webapp/static/modular/system/user/user.js

@@ -102,7 +102,7 @@ MgrUser.delMgrUser = function () {
             Feng.success("删除成功!");
             Feng.success("删除成功!");
             MgrUser.table.refresh();
             MgrUser.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("删除失败!");
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("userId", userId);
         ajax.set("userId", userId);
         ajax.start();
         ajax.start();
@@ -120,7 +120,7 @@ MgrUser.freezeAccount = function () {
             Feng.success("冻结成功!");
             Feng.success("冻结成功!");
             MgrUser.table.refresh();
             MgrUser.table.refresh();
         }, function (data) {
         }, function (data) {
-            Feng.error("冻结失败!");
+            Feng.error("冻结失败!" + data.responseJSON.message + "!");
         });
         });
         ajax.set("userId", userId);
         ajax.set("userId", userId);
         ajax.start();
         ajax.start();