明树Git Lab

Commit c40c19ee authored by zfp1's avatar zfp1

update

parent ce7b100c
Pipeline #104524 passed with stage
in 3 seconds
...@@ -25,7 +25,7 @@ async function updateRole(req, res, next) { ...@@ -25,7 +25,7 @@ async function updateRole(req, res, next) {
return res.sendError(errorMessage.resourceNotFound) return res.sendError(errorMessage.resourceNotFound)
} }
let role = await DB.Role.findOne({ let role = await DB.Role.findOne({
where: {del: 0}, where: {del: 0, id: req.body.id},
raw: true, raw: true,
include: [ include: [
{ {
...@@ -42,6 +42,7 @@ async function updateRole(req, res, next) { ...@@ -42,6 +42,7 @@ async function updateRole(req, res, next) {
} }
if(body.menus) { if(body.menus) {
// body.menus = utils.disTree(body.menus); // body.menus = utils.disTree(body.menus);
console.log(body.menus, "===============")
await userModule.setRoleMenu(role.id, body.menus, role.menus || []); await userModule.setRoleMenu(role.id, body.menus, role.menus || []);
delete body.menus; delete body.menus;
} }
...@@ -110,6 +111,7 @@ async function getRole(req, res, next) { ...@@ -110,6 +111,7 @@ async function getRole(req, res, next) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
ret = ret.toJSON(); ret = ret.toJSON();
console.log(ret.menus, "------------")
if(ret && ret.menus && ret.menus.length) { if(ret && ret.menus && ret.menus.length) {
// ret.menus = utils.buildTree(ret.menus); // ret.menus = utils.buildTree(ret.menus);
ret.menus = ret.menus.map(o => {return o && o.id}); ret.menus = ret.menus.map(o => {return o && o.id});
......
...@@ -120,12 +120,13 @@ async function setRoleMenu(roleId, menuIds, rolemenus) { ...@@ -120,12 +120,13 @@ async function setRoleMenu(roleId, menuIds, rolemenus) {
needAddIds.push(element); needAddIds.push(element);
} }
} }
console.log(roleId, "---", needAddIds.length, needDelIds), "============"
if (needAddIds.length) { if (needAddIds.length) {
let objs = needAddIds.map(o => { return { roleId, menuId: o } }); let objs = needAddIds.map(o => { return { roleId, menuId: o } });
await DB.RoleMenu.bulkCreate(objs); await DB.RoleMenu.bulkCreate(objs);
} }
if (needDelIds.length) { if (needDelIds.length) {
await DB.RoleMenu.destroy({ where: { roleId, menuId: { [Op.in]: needDelIds } } }); let a = await DB.RoleMenu.destroy({ where: { roleId, menuId: { [Op.in]: needDelIds } } });
} }
} }
......
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