feat: 部门查询

Author: kuangshp

src/api/department/department.controller.ts

@@ -8,13 +8,15 @@ import {
   Param,
   ParseIntPipe,
   Query,
+  UseGuards,
 } from '@nestjs/common';
 import { DepartmentService } from './department.service';
 import { DepartmentDto } from './dto/department.dto';
 import { CurrentUser, ICurrentUserType } from '@src/decorators';
 import { DepartmentPageVo, DepartmentVo } from './vo/department.vo';
 import { QueryDepartmentDto } from './dto/department.query';
-
+import { AuthGuard } from '@src/guard/auth.guard';
+@UseGuards(AuthGuard)
 @Controller('department')
 export class DepartmentController {
   constructor(private readonly departmentService: DepartmentService) {}

src/api/department/department.service.ts

@@ -133,12 +133,12 @@ export class DepartmentService {
    * @LastEditors: 水痕
    * @Description: 分页获取部门
    * @param {QueryDepartmentDto} queryOption
-   * @param {ICurrentUserType} currentInfo
+   * @param {ICurrentUserType} currentUser
    * @return {*}
    */
   async getDepartmentPageApi(
     queryOption: QueryDepartmentDto,
-    currentInfo: ICurrentUserType
+    currentUser: ICurrentUserType
   ): Promise<DepartmentPageVo> {
     const {
       status,
@@ -154,7 +154,7 @@ export class DepartmentService {
     if ([StatusEnum.NORMAL, StatusEnum.FORBIDDEN].includes(status)) {
       query.set('status', Equal(status + ''));
     }
-    const { accountType, id, tenantId } = currentInfo;
+    const { accountType, id, tenantId } = currentUser;
     /**
      * 1.如果是超管,查询到全部的账号
      * 2.如果不是超管,是主账号的时候查询下面全部的账号
@@ -172,13 +172,13 @@ export class DepartmentService {
       }
     }
     const total = await this.departmentRepository
-      .createQueryBuilder('account')
+      .createQueryBuilder('department')
       .where(mapToObj(query))
       .getCount();
     const queryBuilder = this.queryDepartmentBuilder;
     const data = await queryBuilder
       .where(mapToObj(query))
-      .orderBy({ accountType: 'DESC', id: 'DESC' })
+      .orderBy({ id: 'DESC' })
       .offset((pageNumber - 1) * pageSize)
       .limit(pageSize)
       .getRawMany();
@@ -266,14 +266,14 @@ export class DepartmentService {
       .addSelect('department.parentId', 'parentId')
       .addSelect('department.sort', 'sort')
       .addSelect('department.status', 'status')
-      .addSelect('account.createdAt', 'createdAt')
-      .addSelect('account.updatedAt', 'updatedAt')
+      .addSelect('department.createdAt', 'createdAt')
+      .addSelect('department.updatedAt', 'updatedAt')
       .leftJoinAndMapOne(
         'xx',
         (qb) =>
           qb
-            .select('department.id', 'parentId')
-            .addSelect('department.title', 'parentTitle')
+            .select('department1.id', 'parentId')
+            .addSelect('department1.title', 'parentTitle')
             .from(DepartmentEntity, 'department1'),
         'department1',
         'department.parentId=department1.parentId'