后台:修改权限用表
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import { GMUserModel } from '@db/GMUser';
|
||||
import { GMGroupModel } from '@db/GMGroup';
|
||||
import { GMUserGroupModel } from '@db/GMUserGroup';
|
||||
import { Service } from 'egg';
|
||||
import { STATUS } from '@consts';
|
||||
import { gameData } from '@pubUtils/data';
|
||||
@@ -24,17 +23,19 @@ export default class GMUsers extends Service {
|
||||
if(!user) {
|
||||
return ctx.service.utils.resResult(STATUS.GM_ERR_PASSWORD);
|
||||
}
|
||||
let userGroup = await GMUserGroupModel.getUserGroupByUid(user.uid);
|
||||
let group = new Array();
|
||||
if(userGroup) {
|
||||
let g = await GMGroupModel.getGroupById(userGroup.groupId);
|
||||
if(g) group.push(g.group);
|
||||
}
|
||||
console.log('******', group, token)
|
||||
|
||||
return ctx.service.utils.resResult(STATUS.SUCCESS, {
|
||||
...user, group, token
|
||||
});
|
||||
if(!user.isEnable) {
|
||||
return ctx.service.utils.resResult(STATUS.GM_NO_AUTHORITY_GET);
|
||||
}
|
||||
let group = new Array();
|
||||
if(user.groupId != undefined) {
|
||||
let g = await GMGroupModel.getGroupById(user.groupId);
|
||||
if(g) group.push(g.group);
|
||||
}
|
||||
console.log('******', group, token)
|
||||
|
||||
return ctx.service.utils.resResult(STATUS.SUCCESS, {
|
||||
...user, group, token
|
||||
});
|
||||
}catch(e) {
|
||||
console.log(e)
|
||||
}
|
||||
@@ -43,10 +44,9 @@ export default class GMUsers extends Service {
|
||||
public async currentUser() {
|
||||
const {ctx} = this;
|
||||
let user = ctx.user;
|
||||
let userGroup = await GMUserGroupModel.getUserGroupByUid(user.uid);
|
||||
let group = new Array();
|
||||
if(userGroup) {
|
||||
let g = await GMGroupModel.getGroupById(userGroup.groupId);
|
||||
if(user.groupId != undefined) {
|
||||
let g = await GMGroupModel.getGroupById(user.groupId);
|
||||
if(g) group.push(g.group);
|
||||
}
|
||||
|
||||
@@ -77,15 +77,12 @@ export default class GMUsers extends Service {
|
||||
if(list) {
|
||||
let result = new Array();
|
||||
for(let user of list) {
|
||||
let uid = user.uid;
|
||||
let userGroup = await GMUserGroupModel.getUserGroupByUid(uid);
|
||||
let groupId = 0, groupStr = '暂无', envs = [];
|
||||
if(userGroup) {
|
||||
let group = await GMGroupModel.getGroupById(userGroup.groupId);
|
||||
console.log(userGroup.groupId, group);
|
||||
if(user.groupId != undefined) {
|
||||
let group = await GMGroupModel.getGroupById(user.groupId);
|
||||
if(group) {
|
||||
groupId = userGroup.groupId;
|
||||
envs = userGroup.envs
|
||||
groupId = user.groupId;
|
||||
envs = user.envs
|
||||
groupStr = group.name;
|
||||
}
|
||||
}
|
||||
@@ -200,8 +197,7 @@ export default class GMUsers extends Service {
|
||||
* 用户组添加接口
|
||||
*/
|
||||
public async saveGmGroupToUser(uid: number, groupId: number, envs: string[]) {
|
||||
|
||||
await GMUserGroupModel.addUserGroup(uid, groupId, envs);
|
||||
await GMUserModel.updateInfo(uid, { groupId, envs });
|
||||
return this.ctx.service.utils.resResult(STATUS.SUCCESS);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user