|
@@ -11,7 +11,7 @@ import PermissionModel from "../models/permission_model";
|
|
import PermissionGroupModel from "../models/permission_group_model";
|
|
import PermissionGroupModel from "../models/permission_group_model";
|
|
import Config from "../../../config/config";
|
|
import Config from "../../../config/config";
|
|
let config = require("../../../config/config.js");
|
|
let config = require("../../../config/config.js");
|
|
-import {default as category, List as categoryList} from "../../common/const/category_const.js";
|
|
|
|
|
|
+import { default as category, List as categoryList } from "../../common/const/category_const.js";
|
|
|
|
|
|
class ManagerController extends BaseController {
|
|
class ManagerController extends BaseController {
|
|
|
|
|
|
@@ -30,7 +30,7 @@ class ManagerController extends BaseController {
|
|
try {
|
|
try {
|
|
// 查找管理员用户列表
|
|
// 查找管理员用户列表
|
|
let managerModel = new ManagerModel();
|
|
let managerModel = new ManagerModel();
|
|
- let total = await managerModel.count({super_admin: 0});
|
|
|
|
|
|
+ let total = await managerModel.count({ super_admin: 0 });
|
|
|
|
|
|
// 分页数据
|
|
// 分页数据
|
|
let page = request.query.page === undefined ? 1 : request.query.page;
|
|
let page = request.query.page === undefined ? 1 : request.query.page;
|
|
@@ -56,7 +56,7 @@ class ManagerController extends BaseController {
|
|
filter.officeName = officeInfo.name
|
|
filter.officeName = officeInfo.name
|
|
}
|
|
}
|
|
if (request.query.permission !== undefined && request.query.permission !== '0') {
|
|
if (request.query.permission !== undefined && request.query.permission !== '0') {
|
|
- let permissionGroupInfo = await permissionGroupModel.findDataByCondition({_id: request.query.permission});
|
|
|
|
|
|
+ let permissionGroupInfo = await permissionGroupModel.findDataByCondition({ _id: request.query.permission });
|
|
filter.permissionGroupName = permissionGroupInfo.name;
|
|
filter.permissionGroupName = permissionGroupInfo.name;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -70,7 +70,7 @@ class ManagerController extends BaseController {
|
|
for (let p in groupPermissionList) {
|
|
for (let p in groupPermissionList) {
|
|
if (p === 'top') {
|
|
if (p === 'top') {
|
|
for (let t of groupPermissionList[p]) {
|
|
for (let t of groupPermissionList[p]) {
|
|
- let topInfo = await permissionModel.findDataByCondition({_id:t});
|
|
|
|
|
|
+ let topInfo = await permissionModel.findDataByCondition({ _id: t });
|
|
topPermissionList.push(topInfo.name);
|
|
topPermissionList.push(topInfo.name);
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
@@ -89,7 +89,7 @@ class ManagerController extends BaseController {
|
|
});
|
|
});
|
|
managerList[tmp].officeName = cate !== undefined ? cate.name : '';
|
|
managerList[tmp].officeName = cate !== undefined ? cate.name : '';
|
|
|
|
|
|
- let groupInfo = managerList[tmp].permission !== '' ? await permissionGroupModel.findDataByCondition({_id:managerList[tmp].permission}) : '';
|
|
|
|
|
|
+ let groupInfo = managerList[tmp].permission !== '' ? await permissionGroupModel.findDataByCondition({ _id: managerList[tmp].permission }) : '';
|
|
managerList[tmp].permissionName = groupInfo !== undefined && groupInfo !== '' ? groupInfo.name : '';
|
|
managerList[tmp].permissionName = groupInfo !== undefined && groupInfo !== '' ? groupInfo.name : '';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -106,7 +106,7 @@ class ManagerController extends BaseController {
|
|
permissionGroupList2: permissionGroupList2,
|
|
permissionGroupList2: permissionGroupList2,
|
|
layout: 'users/views/layout/layout',
|
|
layout: 'users/views/layout/layout',
|
|
filter: filter,
|
|
filter: filter,
|
|
- LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
|
|
|
|
|
|
+ LicenseKey: config.getLicenseKey(process.env.NODE_ENV)
|
|
};
|
|
};
|
|
response.render('users/views/manager/index', renderData);
|
|
response.render('users/views/manager/index', renderData);
|
|
}
|
|
}
|
|
@@ -121,7 +121,7 @@ class ManagerController extends BaseController {
|
|
let id = request.body.manager_id;
|
|
let id = request.body.manager_id;
|
|
let permission = request.body.permission !== '0' ? request.body.permission : '';
|
|
let permission = request.body.permission !== '0' ? request.body.permission : '';
|
|
let managerModel = new ManagerModel();
|
|
let managerModel = new ManagerModel();
|
|
- let result = await managerModel.updateById(id, {permission: permission});
|
|
|
|
|
|
+ let result = await managerModel.updateById(id, { permission: permission });
|
|
|
|
|
|
if (!result) {
|
|
if (!result) {
|
|
throw '修改失败';
|
|
throw '修改失败';
|
|
@@ -195,7 +195,7 @@ class ManagerController extends BaseController {
|
|
let id = request.params.id;
|
|
let id = request.params.id;
|
|
|
|
|
|
let managerModel = new ManagerModel();
|
|
let managerModel = new ManagerModel();
|
|
- let result = await managerModel.updateById(id, {can_login: canLogin});
|
|
|
|
|
|
+ let result = await managerModel.updateById(id, { can_login: canLogin });
|
|
|
|
|
|
// 修改成功
|
|
// 修改成功
|
|
if (!result) {
|
|
if (!result) {
|
|
@@ -216,7 +216,7 @@ class ManagerController extends BaseController {
|
|
try {
|
|
try {
|
|
// 查找对应超级管理员数据
|
|
// 查找对应超级管理员数据
|
|
let managerModel = new ManagerModel();
|
|
let managerModel = new ManagerModel();
|
|
- adminData = await managerModel.findDataByCondition({username: 'admin'});
|
|
|
|
|
|
+ adminData = await managerModel.findDataByCondition({ username: 'admin' });
|
|
|
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
console.log(error);
|
|
console.log(error);
|
|
@@ -225,7 +225,7 @@ class ManagerController extends BaseController {
|
|
let renderData = {
|
|
let renderData = {
|
|
adminData: adminData,
|
|
adminData: adminData,
|
|
layout: 'users/views/layout/layout',
|
|
layout: 'users/views/layout/layout',
|
|
- LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
|
|
|
|
|
|
+ LicenseKey: config.getLicenseKey(process.env.NODE_ENV)
|
|
};
|
|
};
|
|
response.render('users/views/manager/save', renderData);
|
|
response.render('users/views/manager/save', renderData);
|
|
}
|
|
}
|
|
@@ -285,14 +285,16 @@ class ManagerController extends BaseController {
|
|
try {
|
|
try {
|
|
// 获取最高级权限列表
|
|
// 获取最高级权限列表
|
|
let permissionModel = new PermissionModel();
|
|
let permissionModel = new PermissionModel();
|
|
- topPermissionList = await permissionModel.getList({pid:0});
|
|
|
|
|
|
+ topPermissionList = await permissionModel.getList({ pid: 0 });
|
|
|
|
|
|
// 获取所有权限列表,按排序
|
|
// 获取所有权限列表,按排序
|
|
permissionList = topPermissionList;
|
|
permissionList = topPermissionList;
|
|
for (let index in permissionList) {
|
|
for (let index in permissionList) {
|
|
- let count = await permissionModel.count({pid:permissionList[index].ID});
|
|
|
|
|
|
+ let count = await permissionModel.count({ pid: permissionList[index].ID });
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
- permissionList[index].secondPermissionList = await permissionModel.getList({pid: permissionList[index].ID});
|
|
|
|
|
|
+ permissionList[index].secondPermissionList = await permissionModel.getList({ pid: permissionList[index].ID });
|
|
|
|
+ console.log(permissionList[index].ID)
|
|
|
|
+ console.log(permissionList[index].secondPermissionList);
|
|
} else {
|
|
} else {
|
|
permissionList[index].secondPermissionList = [];
|
|
permissionList[index].secondPermissionList = [];
|
|
}
|
|
}
|
|
@@ -318,14 +320,14 @@ class ManagerController extends BaseController {
|
|
if (groupList.length > 0) {
|
|
if (groupList.length > 0) {
|
|
let managerModel = new ManagerModel();
|
|
let managerModel = new ManagerModel();
|
|
for (let tmp in groupList) {
|
|
for (let tmp in groupList) {
|
|
- let managerCount = await managerModel.count({permission: groupList[tmp]._id});
|
|
|
|
|
|
+ let managerCount = await managerModel.count({ permission: groupList[tmp]._id });
|
|
groupList[tmp].manager_count = managerCount;
|
|
groupList[tmp].manager_count = managerCount;
|
|
let groupPermissionList = JSON.parse(groupList[tmp].permission);
|
|
let groupPermissionList = JSON.parse(groupList[tmp].permission);
|
|
for (let p in groupPermissionList) {
|
|
for (let p in groupPermissionList) {
|
|
if (p === 'top') {
|
|
if (p === 'top') {
|
|
let topPermissionList = [];
|
|
let topPermissionList = [];
|
|
for (let t of groupPermissionList[p]) {
|
|
for (let t of groupPermissionList[p]) {
|
|
- let topInfo = await permissionModel.findDataByCondition({_id:t});
|
|
|
|
|
|
+ let topInfo = await permissionModel.findDataByCondition({ _id: t });
|
|
topPermissionList.push(topInfo.name);
|
|
topPermissionList.push(topInfo.name);
|
|
}
|
|
}
|
|
groupList[tmp].top_name = topPermissionList.join(',');
|
|
groupList[tmp].top_name = topPermissionList.join(',');
|
|
@@ -342,7 +344,7 @@ class ManagerController extends BaseController {
|
|
permissionList: permissionList,
|
|
permissionList: permissionList,
|
|
pages: pageData,
|
|
pages: pageData,
|
|
layout: 'users/views/layout/layout',
|
|
layout: 'users/views/layout/layout',
|
|
- LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
|
|
|
|
|
|
+ LicenseKey: config.getLicenseKey(process.env.NODE_ENV)
|
|
};
|
|
};
|
|
response.render('users/views/manager/authority', renderData);
|
|
response.render('users/views/manager/authority', renderData);
|
|
}
|
|
}
|
|
@@ -391,7 +393,7 @@ class ManagerController extends BaseController {
|
|
// 并清空用户所在权限组
|
|
// 并清空用户所在权限组
|
|
let managerModel = new ManagerModel();
|
|
let managerModel = new ManagerModel();
|
|
await managerModel.updateByPermission(id);
|
|
await managerModel.updateByPermission(id);
|
|
- } catch(err) {
|
|
|
|
|
|
+ } catch (err) {
|
|
throw err;
|
|
throw err;
|
|
}
|
|
}
|
|
response.redirect(request.headers.referer);
|
|
response.redirect(request.headers.referer);
|