This commit is contained in:
parent
5e9189a489
commit
e4f864a2ec
1 changed files with 64 additions and 68 deletions
|
|
@ -2301,9 +2301,7 @@ export class PositionController extends Controller {
|
|||
child4: _data.child4,
|
||||
},
|
||||
)
|
||||
.andWhere(
|
||||
new Brackets((qb) => {
|
||||
qb.orWhere(
|
||||
.orWhere(
|
||||
new Brackets((qb) => {
|
||||
qb.andWhere(
|
||||
body.keyword != null && body.keyword != ""
|
||||
|
|
@ -2346,8 +2344,6 @@ export class PositionController extends Controller {
|
|||
.andWhere(typeCondition)
|
||||
.andWhere(revisionCondition);
|
||||
}),
|
||||
);
|
||||
}),
|
||||
)
|
||||
.orderBy("orgRoot.orgRootOrder", "ASC")
|
||||
.addOrderBy("orgChild1.orgChild1Order", "ASC")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue