From 93f250f8ef301ed03e2f441c9788faaa3c8c5bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B9=8F?= <commdev666@163.com>
Date: Fri, 15 Jul 2022 18:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=94=AF=E6=8C=81=E5=A4=9A?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/dict/controller/app/info.ts | 11 ++++++++++-
 src/modules/dict/entity/info.ts         |  3 +++
 src/modules/dict/service/info.ts        |  3 ++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/modules/dict/controller/app/info.ts b/src/modules/dict/controller/app/info.ts
index 172bfc6..aa8b9e9 100644
--- a/src/modules/dict/controller/app/info.ts
+++ b/src/modules/dict/controller/app/info.ts
@@ -1,5 +1,10 @@
 import { Body, Inject, Post, Provide } from '@midwayjs/decorator';
-import { CoolController, BaseController } from '@cool-midway/core';
+import {
+  CoolController,
+  BaseController,
+  CoolUrlTag,
+  TagTypes,
+} from '@cool-midway/core';
 import { DictInfoService } from '../../service/info';
 
 /**
@@ -7,6 +12,10 @@ import { DictInfoService } from '../../service/info';
  */
 @Provide()
 @CoolController()
+@CoolUrlTag({
+  key: TagTypes.IGNORE_TOKEN,
+  value: ['data'],
+})
 export class AppDictInfoController extends BaseController {
   @Inject()
   dictInfoService: DictInfoService;
diff --git a/src/modules/dict/entity/info.ts b/src/modules/dict/entity/info.ts
index dc99631..7af27c1 100644
--- a/src/modules/dict/entity/info.ts
+++ b/src/modules/dict/entity/info.ts
@@ -18,4 +18,7 @@ export class DictInfoEntity extends BaseEntity {
 
   @Column({ comment: '备注', nullable: true })
   remark: string;
+
+  @Column({ comment: '父ID', default: null })
+  parentId: number;
 }
diff --git a/src/modules/dict/service/info.ts b/src/modules/dict/service/info.ts
index 0a6b7de..526a0ac 100644
--- a/src/modules/dict/service/info.ts
+++ b/src/modules/dict/service/info.ts
@@ -32,7 +32,8 @@ export class DictInfoService extends BaseService {
       return {};
     }
     const data = await this.dictInfoEntity
-      .createQueryBuilder()
+      .createQueryBuilder('a')
+      .select(['a.id', 'a.name', 'a.typeId', 'a.parentId'])
       .where('typeId in(:typeIds)', {
         typeIds: typeData.map(e => {
           return e.id;