|
|
@@ -28,7 +28,7 @@ export class RoleServiceMt extends ConcreteCrudService<RoleMt> {
|
|
|
}
|
|
|
|
|
|
const roles = await this.repository.find({ where });
|
|
|
- return roles.length > 0 ? roles[0] : null;
|
|
|
+ return roles.length > 0 ? roles[0] ?? null : null;
|
|
|
} catch (error) {
|
|
|
console.error('Error getting role by name:', error);
|
|
|
throw new Error('Failed to get role by name');
|
|
|
@@ -72,7 +72,7 @@ export class RoleServiceMt extends ConcreteCrudService<RoleMt> {
|
|
|
/**
|
|
|
* 根据ID获取角色(重写以添加租户过滤)
|
|
|
*/
|
|
|
- async getById(id: number, relations: string[] = [], userId?: string | number): Promise<RoleMt | null> {
|
|
|
+ override async getById(id: number, relations: string[] = [], userId?: string | number): Promise<RoleMt | null> {
|
|
|
try {
|
|
|
const where: any = { id };
|
|
|
|
|
|
@@ -91,7 +91,7 @@ export class RoleServiceMt extends ConcreteCrudService<RoleMt> {
|
|
|
/**
|
|
|
* 更新角色(重写以添加租户过滤)
|
|
|
*/
|
|
|
- async update(id: number, data: Partial<RoleMt>, userId?: string | number): Promise<RoleMt | null> {
|
|
|
+ override async update(id: number, data: Partial<RoleMt>, userId?: string | number): Promise<RoleMt | null> {
|
|
|
try {
|
|
|
// 首先验证角色是否存在且属于指定租户
|
|
|
const existingRole = await this.getById(id, [], userId);
|
|
|
@@ -111,7 +111,7 @@ export class RoleServiceMt extends ConcreteCrudService<RoleMt> {
|
|
|
/**
|
|
|
* 删除角色(重写以添加租户过滤)
|
|
|
*/
|
|
|
- async delete(id: number, userId?: string | number): Promise<boolean> {
|
|
|
+ override async delete(id: number, userId?: string | number): Promise<boolean> {
|
|
|
try {
|
|
|
// 首先验证角色是否存在且属于指定租户
|
|
|
const existingRole = await this.getById(id, [], userId);
|