Skip to content

Commit 7ece860

Browse files
committed
fix: 修复status状态为1的时候异常
1 parent 0e1ff7a commit 7ece860

File tree

4 files changed

+7142
-13
lines changed

4 files changed

+7142
-13
lines changed

src/modules/admin/system/access/entities/access.entity.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class AccessEntity extends PublicEntity {
7979
@Column({
8080
type: 'int',
8181
nullable: false,
82-
default: () => 1,
82+
default: () => '1',
8383
name: 'sort',
8484
comment: '排序',
8585
})
@@ -88,7 +88,7 @@ export class AccessEntity extends PublicEntity {
8888
@Column({
8989
type: 'tinyint',
9090
nullable: true,
91-
default: () => 1,
91+
default: () => '1',
9292
name: 'status',
9393
comment: '状态,0表示禁止,1表示正常',
9494
})

src/modules/admin/system/account/entities/account.entity.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class AccountEntity extends PublicEntity {
6161
@Column({
6262
type: 'tinyint',
6363
nullable: true,
64-
default: () => 1,
64+
default: () => '1',
6565
name: 'status',
6666
comment: '状态,0表示禁止,1表示正常',
6767
})
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
11
import { Column, Entity, Unique, Index } from 'typeorm';
22
import { PublicEntity } from '@src/modules/shared/entities/public.entity';
33

4-
54
@Entity('role')
65
@Unique('name_deleted', ['name', 'deletedAt'])
76
export class RoleEntity extends PublicEntity {
87
@Index()
9-
@Column( {
8+
@Column({
109
type: 'varchar',
1110
nullable: false,
1211
length: 50,
1312
name: 'name',
14-
comment: '角色名称'
13+
comment: '角色名称',
1514
})
1615
name: string;
1716

18-
@Column( {
17+
@Column({
1918
type: 'varchar',
2019
nullable: true,
2120
length: 100,
2221
name: 'description',
23-
comment: '角色描素'
22+
comment: '角色描素',
2423
})
2524
description: string;
2625

27-
2826
@Column({
29-
type: 'tinyint',
27+
type: 'tinyint',
3028
nullable: true,
31-
default: () => 1,
29+
default: () => '1',
3230
name: 'status',
33-
comment: '状态1表示正常,0表示不正常'
31+
comment: '状态1表示正常,0表示不正常',
3432
})
3533
status: number;
3634

@@ -39,7 +37,7 @@ export class RoleEntity extends PublicEntity {
3937
nullable: true,
4038
default: () => 0,
4139
name: 'is_default',
42-
comment: '针对后期提供注册用,1表示默认角色,0表示非默认角色'
40+
comment: '针对后期提供注册用,1表示默认角色,0表示非默认角色',
4341
})
4442
isDefault: number;
4543
}

0 commit comments

Comments
 (0)