update

controller/userController.js

@@ -85,7 +85,7 @@ async function login(req, res, next) {
             delete element.menus;
             newRoles.push(element);
         }
-        menus = _.filter(_.uniqBy(menus, 'id'), (o) => {return o.del == 0});
+        menus = _.filter(_.uniqBy(menus, 'id'), (o) => { return o.del == 0 });
         user.roles = newRoles || [];
         // let allMenus = await DB.Menu.findAll({where: {del: 0}, raw: true});
         user.menus = utils.buildTree(menus);
@@ -137,7 +137,7 @@ async function getUserRoleMenuList(req, res, next) {
             delete element.menus;
             newRoles.push(element);
         }
-        let allMenus = await DB.Menu.findAll({where: {del: 0}, raw: true});
+        let allMenus = await DB.Menu.findAll({ where: { del: 0 }, raw: true });
         let newMenus = utils.buildTree(allMenus);
         return res.sendData({
             menus: newMenus,
@@ -209,7 +209,7 @@ async function getUserInfo(req, res, next) {
                     as: 'roles',
                     // where: { del: 0 },
                     // attributes: ['id']
-              },{
+                }, {
                     model: DB.Depart,
                     as: 'departs',
                     // attributes: ["id"],
@@ -265,7 +265,7 @@ async function updateUser(req, res, next) {
             const departIds = body.departs.map(o => { return o && o.id || o });
             console.log(departIds, "==================")
             await userModule.setUserDepart(user.id, departIds, user.departs || []);
-            console.log('user.departs',user.departs);
+            console.log('user.departs', user.departs);
             delete body.departs;
         }
         if (body.roles && body.roles.length) {
@@ -281,12 +281,14 @@ async function updateUser(req, res, next) {
             delete body.roles;
         }
         //
-        if(user.mobile != req.body.mobile) {
-            let mt = await DB.User.findOne({where: {mobile: req.body.mobile, del: 0}});
-            if(mt) {
+        if (req.body.mobile) {
+            if (user.mobile != req.body.mobile) {
+                let mt = await DB.User.findOne({ where: { mobile: req.body.mobile, del: 0 } });
+                if (mt) {
                     return res.sendError(errorMessage.mobileDuplicate)
                 }
             }
+        }
         const ret = await DB.User.update(body, { where: { id: body.id } });
         return res.sendData(ret);
     } catch (error) {
@@ -305,8 +307,8 @@ async function listUser(req, res, next) {
         if (req.body.name) {
             search.where = {
                 [Op.or]: [
-                    {name: { [Op.like]: `%${req.body.name}%` }},
-                    {mobile: { [Op.like]: `%${req.body.mobile}%` }}
+                    { name: { [Op.like]: `%${req.body.name}%` } },
+                    { mobile: { [Op.like]: `%${req.body.mobile}%` } }
                 ],
                 del: 0
             }
@@ -352,11 +354,11 @@ async function deleteUser(req, res, next) {
         }
         const ret = await DB.User.update({ del: 1 }, { where: search });//删除标记
         //删除用户与角色绑定
-        await DB.UserRole.destroy({where: {userId: req.body.id}});
+        await DB.UserRole.destroy({ where: { userId: req.body.id } });
         //删除用户与部门绑定
-        await DB.UserDepart.destroy({where: {userId: req.body.id}});
+        await DB.UserDepart.destroy({ where: { userId: req.body.id } });
         //删除用户与岗位绑定
-        await DB.UserPosition.destroy({where: {userId: req.body.id}});
+        await DB.UserPosition.destroy({ where: { userId: req.body.id } });
         return res.sendData(ret);
     } catch (error) {
         next(error);