fix: fix bugs
This commit is contained in:
parent
230bc6cd5d
commit
8fafe74fa3
@ -120,7 +120,7 @@ app
|
|||||||
})
|
})
|
||||||
.define(async (ctx) => {
|
.define(async (ctx) => {
|
||||||
const tokenUser = ctx.state.tokenUser;
|
const tokenUser = ctx.state.tokenUser;
|
||||||
const { id, createdAt, updatedAt, uid: _, puid: _2, uname: _3, ...data } = ctx.query.data || {};
|
const { id, createdAt, updatedAt, uid: _, puid: _2, uname: _3, data, ...rest } = ctx.query.data || {};
|
||||||
let markModel: MarkModel;
|
let markModel: MarkModel;
|
||||||
if (id) {
|
if (id) {
|
||||||
markModel = await MarkModel.findByPk(id);
|
markModel = await MarkModel.findByPk(id);
|
||||||
@ -133,7 +133,7 @@ app
|
|||||||
const version = Number(markModel.version) + 1;
|
const version = Number(markModel.version) + 1;
|
||||||
await markModel.update({
|
await markModel.update({
|
||||||
...markModel.data,
|
...markModel.data,
|
||||||
...data,
|
...rest,
|
||||||
data: {
|
data: {
|
||||||
...markModel.data,
|
...markModel.data,
|
||||||
...data,
|
...data,
|
||||||
@ -142,7 +142,8 @@ app
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
markModel = await MarkModel.create({
|
markModel = await MarkModel.create({
|
||||||
...data,
|
data,
|
||||||
|
...rest,
|
||||||
uname: tokenUser.username,
|
uname: tokenUser.username,
|
||||||
uid: tokenUser.id,
|
uid: tokenUser.id,
|
||||||
puid: tokenUser.uid,
|
puid: tokenUser.uid,
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 162d4c72b409530c6789ea8b3efcc7963715bed8
|
Subproject commit 0a72db77719e8f99a4027566bc86217c85c1bab3
|
Loading…
x
Reference in New Issue
Block a user