Browse Source

(*)权限配置相关接口修改

master
zmh 1 year ago
parent
commit
b96ff858ef
  1. 38
      api/app/lib/controllers/auth/index.js
  2. 169
      api/app/lib/controllers/role/index.js

38
api/app/lib/controllers/auth/index.js

@ -80,7 +80,43 @@ async function login(ctx, next) {
expired: moment().add(1, 'day'),
userInfo: JSON.stringify(emisLoginRes)
});
const { adminHr, id } = emisLoginRes;
let codes = [];
//人资管理员-所有权限
if (adminHr.some(admin => admin.id == id)) {
const resource = await models.Resource.findAll({
attributes: ['code'],
order: [['id', 'asc']]
})
codes = resource.map(r => r.code);
} else {
const userResources = await models.RoleResource.findAll({
attributes: ['id', 'resId'],
include: [{
required: true,
model: models.Role,
attributes: [],
include: [{
model: models.UserRole,
attributes: [],
where: { userId: id }
}],
}, {
required: true,
model: models.Resource,
attributes: ['id', 'name', 'code'],
}],
order: [['id', 'asc']]
});
let rslt = [];
userResources && userResources.map(ur => {
if (!rslt.some(r => r.id === ur.resId)) {
rslt.push(ur.resource);
codes.push(ur.resource.code);
}
})
}
emisLoginRes.codes = codes;
ctx.status = 200;
ctx.body = emisLoginRes;
}

169
api/app/lib/controllers/role/index.js

@ -3,96 +3,119 @@ const moment = require('moment')
const fs = require('fs');
async function get(ctx) {
try {
const { models } = ctx.fs.dc;
let roleList = await models.Role.findAndCountAll({
where: { delete: true },
order: [['id', 'desc']],
});
ctx.status = 200
ctx.body = roleList;
} catch (error) {
ctx.fs.logger.error(`path:${ctx.path},error:${error}`)
ctx.status = 400;
ctx.body = { name: 'FindError', message: '查询角色数据失败' }
}
try {
const { models } = ctx.fs.dc;
let roleList = await models.Role.findAndCountAll({
where: { delete: false },
order: [['id', 'desc']],
});
ctx.status = 200
ctx.body = roleList;
} catch (error) {
ctx.fs.logger.error(`path:${ctx.path},error:${error}`)
ctx.status = 400;
ctx.body = { name: 'FindError', message: '查询角色数据失败' }
}
}
async function add(ctx) {
try {
const { models } = ctx.fs.dc;
const { name } = ctx.request.body
try {
const { models } = ctx.fs.dc;
const { name } = ctx.request.body
const role = await models.Role.findOne({
where: { name }
})
const role = await models.Role.findOne({
where: { name: name, delete: false }
})
if (role && !role.delete) {
throw '当前角色已存在'
}
if (role) {
throw '当前角色已存在'
}
let storageData = { name ,delete:true}
await models.Role.create(storageData)
ctx.status = 204;
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
let storageData = { name, delete: true }
await models.Role.create(storageData)
ctx.status = 204;
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
}
async function edit(ctx) {
try {
const { models } = ctx.fs.dc;
// const { pepUserId, provinces, cities, businessLines } = ctx.request.body
const { id, name } = ctx.request.body
try {
const { models } = ctx.fs.dc;
// const { pepUserId, provinces, cities, businessLines } = ctx.request.body
const { id, name } = ctx.request.body
const role = await models.Role.findOne({
where: { id }
})
const oldRole = await models.Role.findOne({
where: { id }
})
if (!role) {
throw '当前角色不存在'
}
let storageData = { name }
await models.Role.update(storageData, {
where: { id }
})
ctx.status = 204;
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
if (!oldRole) {
throw '当前角色不存在'
}
const role = await models.Role.findOne({
where: { name: name, id: { $not: id }, delete: false }
})
if (!role) {
throw '当前角色已存在'
}
let storageData = { name }
await models.Role.update(storageData, {
where: { id }
})
ctx.status = 204;
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
}
async function del(ctx) {
try {
const { models } = ctx.fs.dc;
const { id } = ctx.query
const transaction = await ctx.fs.dc.orm.transaction();
try {
const { models } = ctx.fs.dc;
const { id } = ctx.query
await models.Role.update({
delete: false},
{where: {id }
})
ctx.status = 204;
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
await models.Role.update({ delete: true },
{
where: { id },
transaction
})
await models.RoleResource.destroy({
where: {
roleId: id
},
transaction
})
await models.UserRole.destroy({
where: {
roleId: id
},
transaction
})
await transaction.commit();
ctx.status = 204;
} catch (error) {
await transaction.rollback();
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
}
module.exports = {
get,
add,
edit,
del,
get,
add,
edit,
del,
}
Loading…
Cancel
Save