feat: 查询部门

Author: kuangshp

src/api/account/account.module.ts

@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
 import { RouterModule } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ADMIN_PREFIX } from '@src/constants';
+import { DepartmentEntity } from '../department/entities/department.entity';
 import { TenantEntity } from '../tenant/entities/tenant.entity';
 import { AccountController } from './account.controller';
 import { AccountService } from './account.service';
@@ -15,7 +16,7 @@ import { AccountEntity } from './entities/account.entity';
         module: AccountModule,
       },
     ]),
-    TypeOrmModule.forFeature([AccountEntity, TenantEntity]),
+    TypeOrmModule.forFeature([AccountEntity, TenantEntity, DepartmentEntity]),
   ],
   controllers: [AccountController],
   providers: [AccountService],

src/api/account/account.service.ts

@@ -13,6 +13,7 @@ import { AccountTypeEnum } from '@src/enums/account.type.enum';
 import { PageEnum, StatusEnum } from '@src/enums';
 import { mapToObj } from '@src/utils';
 import { TenantEntity } from '../tenant/entities/tenant.entity';
+import { DepartmentEntity } from '../department/entities/department.entity';
 
 @Injectable()
 export class AccountService {
@@ -351,6 +352,7 @@ export class AccountService {
       .addSelect('account.accountType', 'accountType')
       .addSelect('account.tenantId', 'tenantId')
       .addSelect('account.parentId', 'parentId')
+      .addSelect('account.departmentId', 'departmentId')
       .addSelect('account.sort', 'sort')
       .addSelect('account.status', 'status')
       .addSelect('account.lastLoginIp', 'lastLoginIp')
@@ -381,6 +383,16 @@ export class AccountService {
             .from(TenantEntity, 'tenant'),
         'tenant',
         'account.tenantId=tenant.tenantId'
+      )
+      .leftJoinAndMapOne(
+        'xx',
+        (qb) =>
+          qb
+            .select('department.id', 'departmentId')
+            .addSelect('department.title', 'departmentTitle')
+            .from(DepartmentEntity, 'department'),
+        'department',
+        'account.departmentId=department.departmentId'
       );
   }
 }

src/api/account/vo/account.vo.ts

@@ -8,6 +8,8 @@ export class AccountVo extends QueryVo {
   readonly tenantName!: string; // 关联到tenant表名称
   readonly parentId!: number; // 自关联主键id
   readonly parentName!: number; // 自关联主键id
+  readonly departmentId!: number; // 关联到部门表主键id
+  readonly departmentTitle!: string; // 关联到部门表主键id
   readonly sort!: number; // 排序
   readonly status!: number; // 状态0是正常,1是禁用
   readonly lastLoginIp!: string; // 最后登录ip地址