update

controller/roleController.js

@@ -48,7 +48,7 @@ async function updateRole(req, res, next) {
         }
         // sequelize 只有update 写时需要注意条件 不能为空 
         if(role.key != req.body.key) {
-            let rt = await DB.Role.findOne({where: {key: req.body.key}});
+            let rt = await DB.Role.findOne({where: {key: req.body.key, del: 0}});
             if(rt) {
                 return res.sendError(errorMessage.roleDuplicate);
             }

controller/userController.js

@@ -161,11 +161,12 @@ async function createUser(req, res, next) {
         body.password = passwordHash;
         const checkMobile = await DB.User.findOne({
           where: {
-            mobile: body.mobile
+            mobile: body.mobile,
+            del: 0
           }
         });     
         if (checkMobile) { 
-          return res.sendError(errorMessage.nameDuplicated)
+          return res.sendError(errorMessage.mobileDuplicate)
         }
         const ret = await DB.User.create(body);
         if (!(ret && ret.id)) {
@@ -281,7 +282,7 @@ async function updateUser(req, res, next) {
         }
         //
         if(user.mobile != req.body.mobile) {
-            let mt = await DB.User.findOne({where: {mobile: req.body.mobile}});
+            let mt = await DB.User.findOne({where: {mobile: req.body.mobile, del: 0}});
             if(mt) {
                 return res.sendError(errorMessage.mobileDuplicate)
             }