feat: 修改部门

Author: kuangshp

nestjs-mysql-api.sql

@@ -49,7 +49,7 @@ DROP TABLE IF EXISTS `department`;
 CREATE TABLE `department` (
    `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY key COMMENT '主键id',
    `title` varchar(50)  NOT NULL COMMENT '部门名称',
-   `name` varchar(50)  DEFAULT NULL COMMENT '部门负责人',
+   `account_id` int(11)  DEFAULT NULL COMMENT '部门负责人,关联到account表主键id',
    `mobile` varchar(50)  DEFAULT NULL COMMENT '联系手机号码',
    `email` varchar(50)  DEFAULT NULL COMMENT '电邮地址',
    `description` varchar(255)  DEFAULT NULL COMMENT '描述',

src/api/department/department.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 { AccountEntity } from '../account/entities/account.entity';
 import { TenantEntity } from '../tenant/entities/tenant.entity';
 import { DepartmentController } from './department.controller';
 import { DepartmentService } from './department.service';
@@ -15,7 +16,7 @@ import { DepartmentEntity } from './entities/department.entity';
         module: DepartmentModule,
       },
     ]),
-    TypeOrmModule.forFeature([DepartmentEntity, TenantEntity]),
+    TypeOrmModule.forFeature([DepartmentEntity, TenantEntity, AccountEntity]),
   ],
   controllers: [DepartmentController],
   providers: [DepartmentService],

src/api/department/department.service.ts

@@ -12,6 +12,7 @@ import { QueryDepartmentDto } from './dto/department.query';
 import { PageEnum, StatusEnum } from '@src/enums';
 import { mapToObj } from '@src/utils';
 import { AccountTypeEnum } from '@src/enums/account.type.enum';
+import { AccountEntity } from '../account/entities/account.entity';
 
 @Injectable()
 export class DepartmentService {
@@ -32,14 +33,14 @@ export class DepartmentService {
   async createDepartmentApi(req: DepartmentDto, currentUser: ICurrentUserType): Promise<string> {
     // 1.判断部门存在吗
     const { tenantId } = currentUser;
-    const departmentEntity: Pick<DepartmentEntity, 'id'> | null =
-      await this.departmentRepository.findOne({
-        where: { tenantId, title: req.title },
-        select: ['id'],
-      });
-    if (departmentEntity?.id) {
-      throw new HttpException(`${req.title}已经存在`, HttpStatusCode.Ok);
-    }
+    // const departmentEntity: Pick<DepartmentEntity, 'id'> | null =
+    //   await this.departmentRepository.findOne({
+    //     where: { tenantId, title: req.title },
+    //     select: ['id'],
+    //   });
+    // if (departmentEntity?.id) {
+    //   throw new HttpException(`${req.title}已经存在`, HttpStatusCode.Ok);
+    // }
     const data = this.departmentRepository.create({ ...req, tenantId });
     await this.departmentRepository.save(data);
     return '创建成功';
@@ -290,9 +291,9 @@ export class DepartmentService {
       .createQueryBuilder('department')
       .select('department.id', 'id')
       .addSelect('department.title', 'title')
-      .addSelect('department.name', 'name')
       .addSelect('department.mobile', 'mobile')
       .addSelect('department.email', 'email')
+      .addSelect('department.accountId', 'accountId')
       .addSelect('department.tenantId', 'tenantId')
       .addSelect('department.parentId', 'parentId')
       .addSelect('department.sort', 'sort')
@@ -318,6 +319,16 @@ export class DepartmentService {
             .from(TenantEntity, 'tenant'),
         'tenant',
         'department.tenantId=tenant.tenantId'
+      )
+      .leftJoinAndMapOne(
+        'xx',
+        (qb) =>
+          qb
+            .select('account.id', 'accountId')
+            .addSelect('account.username', 'name')
+            .from(AccountEntity, 'account'),
+        'account',
+        'department.accountId=account.accountId'
       );
   }
 }

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

@@ -6,9 +6,11 @@ export class DepartmentDto {
   @IsNotEmpty({ message: '部门名称不能为空' })
   title!: string;
 
-  @MaxLength(50, { message: '部门负责人最大长度为50' })
+  @Min(1, { message: '部门负责人最小值为1' })
+  @IsInt({ message: '部门负责人必须是整数' })
+  @Type(() => Number)
   @IsOptional({ message: '部门负责人' })
-  name!: string;
+  accountId!: number;
 
   @IsOptional({ message: '联系手机号码' })
   mobile!: string;

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

@@ -1,5 +1,5 @@
 import { SharedEntity } from '@src/shared/entities/base.entity';
-import { Entity, Column, Index } from 'typeorm';
+import { Entity, Column } from 'typeorm';
 
 @Entity('department')
 export class DepartmentEntity extends SharedEntity {
@@ -11,15 +11,12 @@ export class DepartmentEntity extends SharedEntity {
   })
   title!: string;
 
-  @Index()
   @Column({
-    type: 'varchar',
-    length: 50,
-    name: 'name',
-    nullable: true,
-    comment: '部门负责人',
+    type: 'int',
+    name: 'account_id',
+    comment: '部门负责人,关联到account表主键id',
   })
-  name!: string;
+  accountId!: number;
 
   @Column({
     type: 'varchar',

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

@@ -3,6 +3,7 @@ import { QueryVo } from '@src/shared/vo/query.vo';
 
 export class DepartmentVo extends QueryVo {
   readonly title!: string; // 部门名称
+  readonly accountId!: number; // 部门负责人
   readonly name!: string; // 部门负责人
   readonly mobile!: string; // 联系手机号码
   readonly email!: string; // 电邮地址