feat: 账号查询

Author: kuangshp

src/api/account/account.controller.ts

@@ -17,6 +17,7 @@ import { CurrentUser, ICurrentUserType } from '@src/decorators';
 import { Request } from 'express';
 import { AccountPageVo, AccountVo } from './vo/account.vo';
 import { QueryAccountDto } from './dto/account.query';
+import { AccountEntity } from './entities/account.entity';
 
 @UseGuards(AuthGuard)
 @Controller('account')
@@ -64,6 +65,14 @@ export class AccountController {
     return await this.accountService.getAccountPageApi(queryOption, currentInfo);
   }
 
+  @Get('list')
+  async getAccountListApi(
+    @CurrentUser('userInfo') currentInfo: ICurrentUserType,
+    @Query('status') status: number
+  ): Promise<Pick<AccountEntity, 'id' | 'username'>[]> {
+    return await this.accountService.getAccountListApi(currentInfo, status);
+  }
+
   @Get(':id')
   async getAccountByIdApi(
     @Param('id', new ParseIntPipe()) id: number

src/api/account/account.service.ts

@@ -35,7 +35,7 @@ export class AccountService {
     request: Request,
     currentInfo: ICurrentUserType
   ): Promise<string> {
-    console.log(request);
+    console.log('进来了------------------》》', request);
     // 1.判断当前商户下是否已经存在该账号
     const accountEntity: Pick<AccountEntity, 'id'> | null = await this.accountRepository.findOne({
       where: { username: req.username, tenantId: currentInfo.tenantId },
@@ -54,9 +54,9 @@ export class AccountService {
       sort: req.sort,
       password: password,
       tenantId: currentInfo.tenantId,
-      parentId: currentInfo.accountId,
+      parentId: req.parentId ? req.parentId : currentInfo.id,
       salt: salt,
-      lastLoginIp: this.toolsService.getReqIP(request),
+      // lastLoginIp: this.toolsService.getReqIP(request),
       lastLoginDate: new Date(),
     });
     await this.accountRepository.save(data);
@@ -180,7 +180,7 @@ export class AccountService {
     if ([StatusEnum.NORMAL, StatusEnum.FORBIDDEN].includes(status)) {
       query.set('status', Equal(status + ''));
     }
-    const { accountType, accountId, tenantId } = currentInfo;
+    const { accountType, id, tenantId } = currentInfo;
     /**
      * 1.如果是超管,查询到全部的账号
      * 2.如果不是超管,是主账号的时候查询下面全部的账号
@@ -194,19 +194,18 @@ export class AccountService {
       } else if (accountType == AccountTypeEnum.PRIMARY_ACCOUNT) {
         query.set('tenantId', Equal(tenantId + ''));
       } else if (accountType == AccountTypeEnum.NORMAL_ACCOUNT) {
-        query.set('parentId', Equal(accountId + ''));
+        query.set('parentId', Equal(id + ''));
       }
     }
 
-    console.log(mapToObj(query), '???????????????????');
     const total = await this.accountRepository
       .createQueryBuilder('account')
       .where(mapToObj(query))
       .getCount();
     const queryBuilder = this.queryAccountBuilder;
     const data = await queryBuilder
       .where(mapToObj(query))
-      .orderBy({ id: 'DESC' })
+      .orderBy({ accountType: 'DESC', id: 'DESC' })
       .offset((pageNumber - 1) * pageSize)
       .limit(pageSize)
       .getRawMany();
@@ -218,6 +217,37 @@ export class AccountService {
     };
   }
 
+  /**
+   * @Author: 水痕
+   * @Date: 2023-10-10 18:56:27
+   * @LastEditors: 水痕
+   * @Description: 获取当前账号下的子账号
+   * @param {ICurrentUserType} currentInfo
+   * @param {number} status
+   * @return {*}
+   */
+  async getAccountListApi(
+    currentInfo: ICurrentUserType,
+    status: number
+  ): Promise<Pick<AccountEntity, 'id' | 'username'>[]> {
+    const { id, accountType } = currentInfo;
+    console.log(status, '状态');
+    const query = new Map<string, FindOperator<string>>();
+    if (Object.is(accountType, AccountTypeEnum.SUPER_ACCOUNT)) {
+      query.set('parentId', Equal(-1 + ''));
+    } else {
+      query.set('parentId', Equal(id + ''));
+    }
+    if ([StatusEnum.FORBIDDEN, StatusEnum.NORMAL].includes(status)) {
+      query.set('status', Equal(status + ''));
+    }
+    const accountEntity: Pick<AccountEntity, 'id' | 'username'>[] =
+      await this.accountRepository.find({
+        where: mapToObj(query),
+        select: ['id', 'username'],
+      });
+    return accountEntity;
+  }
   /**
    * @Author: 水痕
    * @Date: 2023-10-07 20:28:16

src/api/account/dto/account.dto.ts

@@ -11,4 +11,10 @@ export class AccountDto {
   @Type(() => Number)
   @IsOptional({ message: '排序' })
   sort!: number;
+
+  @Min(1, { message: '父节点id最小值为1' })
+  @IsInt({ message: '父节点id必须是整数' })
+  @Type(() => Number)
+  @IsOptional({ message: '父节点id' })
+  parentId!: number;
 }

src/api/role/role.service.ts

@@ -30,7 +30,7 @@ export class RoleService {
    * @return {*}
    */
   async createRoleApi(req: RoleDto, currentInfo: ICurrentUserType): Promise<string> {
-    const { accountId, tenantId } = currentInfo;
+    const { id, tenantId } = currentInfo;
     // 1.判断当前账号下角色是否存在
     const roleEntity: Pick<RoleEntity, 'id'> | null = await this.roleRepository.findOne({
       where: { name: req.name, tenantId: tenantId },
@@ -42,7 +42,7 @@ export class RoleService {
     const roleData = this.roleRepository.create({
       name: req.name,
       tenantId,
-      accountId,
+      accountId: id,
       sort: req.sort,
       description: req.description,
     });
@@ -129,7 +129,7 @@ export class RoleService {
       pageNumber = PageEnum.PAGE_NUMBER,
       pageSize = PageEnum.PAGE_SIZE,
     } = queryOption;
-    const { accountType, accountId, tenantId } = currentInfo;
+    const { accountType, id, tenantId } = currentInfo;
     const query = new Map<string, FindOperator<string>>();
     if (name) {
       query.set('name', ILike(`%${name}%`));
@@ -142,7 +142,7 @@ export class RoleService {
     } else if (accountType == AccountTypeEnum.PRIMARY_ACCOUNT) {
       query.set('tenantId', Equal(tenantId + ''));
     } else if (accountType == AccountTypeEnum.NORMAL_ACCOUNT) {
-      query.set('accountId', Equal(accountId + ''));
+      query.set('accountId', Equal(id + ''));
     }
     const queryBuilder = this.queryRoleBuilder;
     const data = await queryBuilder

src/decorators/current-user.decorator.ts

@@ -5,7 +5,6 @@ import { createParamDecorator, ExecutionContext } from '@nestjs/common';
  */
 export interface ICurrentUserType {
   id: number; // 账号id
-  accountId: number; // 账号id
   username: string; // 用户名
   tenantId: number; // 商户id
   accountType: number; // 账号类型:0普通账号,1是主账号,2是超管