github/cool-admin-midway
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-midway.git synced 2025-12-11 00:22:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '8.x' of https://e.coding.net/shancool/cool-admin/midway into 8.x

Browse Source
This commit is contained in:
COOL 2025-02-07 18:49:40 +08:00
commit 2fda7d0602
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/base/service/sys/user.ts
View File

@ -9,6 +9,7 @@ import { BaseSysUserRoleEntity } from '../../entity/sys/user_role';
import * as md5 from 'md5';
import { BaseSysDepartmentEntity } from '../../entity/sys/department';
import { CachingFactory, MidwayCache } from '@midwayjs/cache-manager';
import { BaseSysRoleEntity } from '../../entity/sys/role';
/**
* 系统用户
@ -70,15 +71,15 @@ export class BaseSysUserService extends BaseService {
// 匹配角色
if (!_.isEmpty(result.list)) {
const userIds = result.list.map(e => e.id);
const roles = await this.nativeQuery(
const roles: BaseSysRoleEntity[] = await this.nativeQuery(
'SELECT b.name, a.userId FROM base_sys_user_role a LEFT JOIN base_sys_role b ON a.roleId = b.id WHERE a.userId in (?) ',
[userIds]
);
result.list.forEach(e => {
e['roleName'] = roles
.filter(role => role.userId == e.id)
.map(role => role.name)
.join(',');
const arr = roles.filter(a => a.userId == e.id);
e['roleIds'] = arr.map(a => a.userId);
e['roleName'] = arr.map(a => a.name).join(',');
});
}
return result;