Merge branch 'dev' into 'master'

name && mobile模糊检索

See merge request !4

controller/userController.js

 const crypto = require('crypto');
 const _ = require('lodash');
 const CryptoJS = require('crypto-js');
-const { Op } = require('sequelize');
+const { Op, where } = require('sequelize');
 const userModule = require('../module/userModule');
  
 const errorMessage = require('../utils/errorMessage');
@@ -104,6 +104,16 @@ async function createUser(req, res, next) {
         const { salt, passwordHash } = utils.saltHashPassword(req.body.password);
         body.salt = salt;
         body.password = passwordHash;
+        const checkMobile = await DB.User.findOne({
+          where: {
+            mobile: body.mobile
+          }
+        });     
+        console.log("checkMobile", checkMobile);
+        console.log("checkMobile", checkMobile.length);
+        if (checkMobile) { 
+          return res.sendError(errorMessage.nameDuplicated)
+        }
         const ret = await DB.User.create(body);
         if (!(ret && ret.id)) {
             return res.sendError(errorMessage.databaseQueryError);
@@ -229,15 +239,16 @@ async function listUser(req, res, next) {
         let page = req.body.page || 1;
         let limit = req.body.pageSize || 10;
         let offset = (page - 1) * limit;
-        if (req.body.name) {
-            search.where = {
-                [Op.or]: [
-                    { name: { [Op.like]: `%${req.body.name}%` } },
-                    { mobile: { [Op.like]: `%${req.body.name}%` } }
-                ],
-                del: 0,
-            }
+        const body = req.body
+        const name = body.name ? String(body.name).trim() : '';
+        const mobile = body.mobile ? String(body.mobile).trim() : '';
+        const where = { del: 0 };
+        if (name || mobile) {
+          where[Op.or] = [];
+          if (name) where[Op.or].push({ name: { [Op.like]: `%${name}%` } });
+          if (mobile) where[Op.or].push({ mobile: { [Op.like]: `%${mobile}%` } });
         }
+        search.where = where
         search.limit = limit;
         search.offset = offset;
         search.include = [