1

controller/roleController.js

@@ -71,10 +71,10 @@ async function deleteRole(req, res, next) {
         if (!req.body.id) {
             return res.sendError(errorMessage.resourceNotFound);
         }
-        // let urs = await DB.UserRole.findAll({where: {roleId: req.bodyshan.id}, raw: true});
-        // if(urs && urs.length > 0) {
-        //     // res.sendError()
-        // }
+        let urs = await DB.UserRole.count({where: {roleId: req.body.id}});
+        if(urs && urs > 0) {
+            res.sendError(errorMessage.databaseQueryError)
+        }
         const ret = await DB.Role.update({ del: 1 }, { where: { id: req.body.id } });
         //删除用户角色绑定
         await DB.UserRole.destroy({ where: { roleId: req.body.id } });

utils/errorMessage.js

@@ -19,20 +19,24 @@ module.exports = {
     },
     departHasUser: {
         code: 40005,
-        message: "该部门下有绑定用户，不能删除！"
+        message: "该部门下有绑定用户，不能删除！请联系管理员处理。"
     },
     
     mobileDuplicate : {
         code: 40006,
-        message: "电话号码重复"
+        message: "电话号码重复！"
     },
     roleDuplicate : {
         code: 40007,
-        message: "角色标识重复"
+        message: "角色标识重复！"
     },
     roesourceDuplicate : {
         code: 40008,
-        message: "资源库标识重复"
+        message: "资源库标识重复！"
+    },
+    rolehasuser : {
+        code: 40009,
+        message: "该角色已绑定用户，不能删除！请联系管理员处理。"
     },