|
@@ -12,8 +12,9 @@ export class AreaService {
|
|
|
const areas = await this.areaRepository.find({
|
|
const areas = await this.areaRepository.find({
|
|
|
where: { isDeleted: 0 },
|
|
where: { isDeleted: 0 },
|
|
|
order: {
|
|
order: {
|
|
|
|
|
+ id: 'ASC',
|
|
|
level: 'ASC',
|
|
level: 'ASC',
|
|
|
- name: 'ASC'
|
|
|
|
|
|
|
+ name: 'ASC',
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
@@ -144,8 +145,9 @@ export class AreaService {
|
|
|
isDisabled: DisabledStatus.ENABLED
|
|
isDisabled: DisabledStatus.ENABLED
|
|
|
},
|
|
},
|
|
|
order: {
|
|
order: {
|
|
|
|
|
+ id: 'ASC',
|
|
|
level: 'ASC',
|
|
level: 'ASC',
|
|
|
- name: 'ASC'
|
|
|
|
|
|
|
+ name: 'ASC',
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|