明树Git Lab

Commit da4a6094 authored by zfp1's avatar zfp1

update

parent edc3e6d2
Pipeline #108112 passed with stage
in 3 seconds
......@@ -10,7 +10,7 @@ async function getMessageInfo(req, res, next) {
if (!req.body.id) {
return res.sendError(errorMessage.resourceNotFound);
}
const message = await DB.Message.findOne({
let message = await DB.Message.findOne({
where: { id: req.body.id, del: 0 },
include: [
{
......@@ -20,9 +20,10 @@ async function getMessageInfo(req, res, next) {
}
]
});
message.alreadyRead = message.alreadyRead || [];
message.alreadyRead.push(req.user.id);
await message.save();
let alreadyRead = message.alreadyRead || [];
alreadyRead.push(req.user.id);
await DB.Message.update( { alreadyRead },
{ where: { id: req.body.id } });
return res.sendData(message);
} catch (error) {
next(error);
......@@ -136,7 +137,7 @@ async function getMesCount(req, res, next) {
sequelize.cast(req.user.id, 'JSON'), // 直接将数字转换为JSON
sequelize.literal("'$'")
),
true
false
)
]
}
......
......@@ -85,7 +85,7 @@ async function login(req, res, next) {
delete element.menus;
newRoles.push(element);
}
console.log(menus, "================================")
menus = _.uniqBy(menus, 'id');
user.roles = newRoles || [];
// let allMenus = await DB.Menu.findAll({where: {del: 0}, raw: true});
user.menus = utils.buildTree(menus);
......
......@@ -15,11 +15,13 @@ const Message = sequelize.define('Message', {
},
receivers: {
type: DataTypes.JSON,
comment: "接收人ID"
comment: "接收人ID",
defaultValue: []
},
alreadyRead: {
type: DataTypes.JSON,
comment: "已经阅读人ID"
comment: "已经阅读人ID",
defaultValue: []
},
title: {
type: DataTypes.TEXT,
......
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