feat: 部门

Author: kuangshp

src/api/department/department.controller.ts

@@ -13,7 +13,7 @@ import {
 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 { DepartmentPageVo, DepartmentVo, SimplenessDepartmentVo } from './vo/department.vo';
 import { QueryDepartmentDto } from './dto/department.query';
 import { AuthGuard } from '@src/guard/auth.guard';
 @UseGuards(AuthGuard)
@@ -58,6 +58,13 @@ export class DepartmentController {
     return await this.departmentService.getDepartmentPageApi(queryOption, currentUser);
   }
 
+  @Get('list')
+  async getDepartmentListApi(
+    @CurrentUser('userInfo') currentUser: ICurrentUserType
+  ): Promise<SimplenessDepartmentVo[]> {
+    return await this.departmentService.getDepartmentListApi(currentUser);
+  }
+
   @Get(':id')
   async getDepartmentByIdApi(
     @Param('id', new ParseIntPipe()) id: number

src/api/department/department.service.ts

@@ -6,7 +6,7 @@ import { Equal, FindOperator, ILike, In, Repository, SelectQueryBuilder } from '
 import { DepartmentDto } from './dto/department.dto';
 import { ICurrentUserType } from '@src/decorators';
 import { HttpStatusCode } from 'axios';
-import { DepartmentPageVo, DepartmentVo } from './vo/department.vo';
+import { DepartmentPageVo, DepartmentVo, SimplenessDepartmentVo } from './vo/department.vo';
 import { TenantEntity } from '../tenant/entities/tenant.entity';
 import { QueryDepartmentDto } from './dto/department.query';
 import { PageEnum, StatusEnum } from '@src/enums';
@@ -182,6 +182,7 @@ export class DepartmentService {
       .offset((pageNumber - 1) * pageSize)
       .limit(pageSize)
       .getRawMany();
+    console.log(data, '????????????????');
     return {
       data,
       total,
@@ -190,6 +191,26 @@ export class DepartmentService {
     };
   }
 
+  /**
+   * @Author: 水痕
+   * @Date: 2023-10-18 20:27:28
+   * @LastEditors: 水痕
+   * @Description: 获取当前商户下的部门
+   * @param {ICurrentUserType} currentUser
+   * @return {*}
+   */
+  async getDepartmentListApi(currentUser: ICurrentUserType): Promise<SimplenessDepartmentVo[]> {
+    const { id, tenantId, accountType } = currentUser;
+    const query = new Map<string, FindOperator<string>>();
+    query.set('tenantId', Equal(tenantId + ''));
+    if (accountType != AccountTypeEnum.SUPER_ACCOUNT) {
+      query.set('parentId', Equal(id + ''));
+    }
+    return await this.departmentRepository.find({
+      where: mapToObj(query),
+      select: ['id', 'title', 'parentId'],
+    });
+  }
   /**
    * @Author: 水痕
    * @Date: 2023-10-18 15:21:30
@@ -206,30 +227,39 @@ export class DepartmentService {
    * @Author: 水痕
    * @Date: 2023-10-18 15:52:37
    * @LastEditors: 水痕
-   * @Description: 根据id列表修改状态
+   * @Description: 批量删除部门
    * @param {number} idList
    * @return {*}
    */
   async batchDeleteDepartmentByIdListApi(idList: number[]): Promise<string> {
-    const departmentEntityList: Pick<DepartmentEntity, 'status'>[] =
-      await this.departmentRepository.find({ where: { id: In(idList) }, select: ['status'] });
-    const statusList = departmentEntityList.map((item) => item.status);
-    if ([...new Set(statusList)].length > 1) {
-      throw new HttpException('当前部门多个状态,不能批量操作', HttpStatusCode.Ok);
+    const departmentEntityList: Pick<DepartmentEntity, 'parentId'>[] =
+      await this.departmentRepository.find({
+        where: { parentId: In(idList) },
+        select: ['parentId', 'id'],
+      });
+    if (departmentEntityList.length > 0) {
+      throw new HttpException('当前部门有子部门,不能直接删除', HttpStatusCode.Ok);
     }
-    const status = statusList[0] == StatusEnum.FORBIDDEN ? StatusEnum.NORMAL : StatusEnum.FORBIDDEN;
-    const { affected } = await this.departmentRepository.update({ id: In(idList) }, { status });
+    const departmentEntityList1: Pick<DepartmentEntity, 'parentId'>[] =
+      await this.departmentRepository.find({
+        where: { id: In(idList) },
+        select: ['parentId'],
+      });
+    if (departmentEntityList1.map((item) => item.parentId).includes(-1)) {
+      throw new HttpException('当前部门有子部门,不能直接删除', HttpStatusCode.Ok);
+    }
+    const { affected } = await this.departmentRepository.softDelete({ id: In(idList) });
     if (affected) {
-      return '修改成功';
+      return '删除成功';
     } else {
-      return '修改失败';
+      return '删除失败';
     }
   }
   /**
    * @Author: 水痕
    * @Date: 2023-10-18 15:58:14
    * @LastEditors: 水痕
-   * @Description: 批量删除部门
+   * @Description:根据id列表修改状态
    * @param {number} idList
    * @return {*}
    */
@@ -240,11 +270,12 @@ export class DepartmentService {
     if ([...new Set(statusList)].length > 1) {
       throw new HttpException('当前部门多个状态,不能批量操作', HttpStatusCode.Ok);
     }
-    const { affected } = await this.departmentRepository.softDelete({ id: In(idList) });
+    const status = statusList[0] == StatusEnum.FORBIDDEN ? StatusEnum.NORMAL : StatusEnum.FORBIDDEN;
+    const { affected } = await this.departmentRepository.update({ id: In(idList) }, { status });
     if (affected) {
-      return '删除成功';
+      return '修改成功';
     } else {
-      return '删除失败';
+      return '修改失败';
     }
   }
   /**

src/api/department/dto/department.dto.ts

@@ -27,7 +27,6 @@ export class DepartmentDto {
   @IsOptional({ message: '排序' })
   sort!: number;
 
-  @Min(1, { message: '自己关联主键id最小值为1' })
   @IsInt({ message: '自己关联主键id必须是整数' })
   @Type(() => Number)
   parentId!: number;

src/api/department/entities/department.entity.ts

@@ -79,7 +79,7 @@ export class DepartmentEntity extends SharedEntity {
     type: 'int',
     name: 'parent_id',
     nullable: true,
-    default: '-1',
+    default: -1,
     comment: '自己关联主键id',
   })
   parentId!: number;

src/api/department/vo/department.vo.ts

@@ -11,10 +11,16 @@ export class DepartmentVo extends QueryVo {
   readonly sort!: number; // 排序
   readonly tenantId!: number; // 关联到tenant表主键id
   readonly tenantName!: string; // 关联到tenant表主键id
-  readonly parentId!: number; // 自己关联主键id
+  readonly parentId!: number | string; // 自己关联主键id
   readonly parentTitle!: string; // 自己关联主键id
 }
 
 export class DepartmentPageVo extends QueryListVo {
   readonly data!: DepartmentVo[];
 }
+
+export class SimplenessDepartmentVo {
+  readonly id!: number; // 部门id
+  readonly title!: string; // 部门名称
+  readonly parentId!: number; // 自己关联主键id
+}