明树Git Lab

Commit d41faef4 authored by zfp1's avatar zfp1

update

parents 53f4afe2 eb8b01a1
Pipeline #103965 passed with stage
in 3 seconds
const crypto = require('crypto'); const crypto = require('crypto');
const _ = require('lodash'); const _ = require('lodash');
const CryptoJS = require('crypto-js'); const CryptoJS = require('crypto-js');
const { Op } = require('sequelize'); const { Op, where } = require('sequelize');
const userModule = require('../module/userModule'); const userModule = require('../module/userModule');
const errorMessage = require('../utils/errorMessage'); const errorMessage = require('../utils/errorMessage');
...@@ -104,6 +104,16 @@ async function createUser(req, res, next) { ...@@ -104,6 +104,16 @@ async function createUser(req, res, next) {
const { salt, passwordHash } = utils.saltHashPassword(req.body.password); const { salt, passwordHash } = utils.saltHashPassword(req.body.password);
body.salt = salt; body.salt = salt;
body.password = passwordHash; 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); const ret = await DB.User.create(body);
if (!(ret && ret.id)) { if (!(ret && ret.id)) {
return res.sendError(errorMessage.databaseQueryError); return res.sendError(errorMessage.databaseQueryError);
...@@ -230,18 +240,12 @@ async function listUser(req, res, next) { ...@@ -230,18 +240,12 @@ async function listUser(req, res, next) {
let limit = req.body.pageSize || 10; let limit = req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
if (req.body.name) { if (req.body.name) {
// search.where = {
// [Op.or]: [
// { name: { [Op.like]: `%${req.body.name}%` } },
// { mobile: { [Op.like]: `%${req.body.name}%` } }
// ],
// del: 0,
// }
search.where.name ={ [Op.like]: `%${req.body.name}%` } search.where.name ={ [Op.like]: `%${req.body.name}%` }
} }
if (req.body.mobile) { if (req.body.mobile) {
search.where.mobile = { [Op.like]: `%${req.body.name}%` } search.where.mobile = { [Op.like]: `%${req.body.name}%` }
} }
search.where = where
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
search.include = [ search.include = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment