This commit is contained in:
@@ -82,9 +82,9 @@ export class FieldService {
|
||||
|
||||
findAll(entityId: string) {
|
||||
return this.fieldRepository.find({
|
||||
entityId
|
||||
entityId,
|
||||
},
|
||||
{ populate: ['options'] });
|
||||
{ populate: ['options'], orderBy: { order: 'ASC' } });
|
||||
}
|
||||
|
||||
async findAllByIds(dto: FindFieldsGroupDto) {
|
||||
|
||||
@@ -48,7 +48,7 @@ export class PrintService {
|
||||
}
|
||||
|
||||
async findAll(): Promise<PrintWithFields[]> {
|
||||
const sections = await this.printRepository.findAll();
|
||||
const sections = await this.printRepository.findAll({ orderBy: { order: 'ASC' } });
|
||||
|
||||
const promises = sections.map(async (section) => {
|
||||
const fields = await this.fieldService.findAll(section.id)
|
||||
|
||||
Reference in New Issue
Block a user