fix condition filter orgrevision
This commit is contained in:
parent
53e7badead
commit
189b8846f4
1 changed files with 8 additions and 5 deletions
|
|
@ -6284,11 +6284,14 @@ export class ProfileController extends Controller {
|
|||
"orgChild4.orgChild4ShortName",
|
||||
"orgChild4.orgChild4Order",
|
||||
])
|
||||
.where(node && nodeId ? "current_holders.orgRevisionId = :orgRevisionId" : "1=1", {
|
||||
orgRevisionId:
|
||||
node && nodeId
|
||||
? (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
|
||||
: undefined,
|
||||
// .where(node && nodeId ? "current_holders.orgRevisionId = :orgRevisionId" : "1=1", {
|
||||
// orgRevisionId:
|
||||
// node && nodeId
|
||||
// ? (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
|
||||
// : undefined,
|
||||
// })
|
||||
.where("current_holders.orgRevisionId = :orgRevisionId", {
|
||||
orgRevisionId: (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
|
||||
})
|
||||
.andWhere(
|
||||
_data.root != undefined && _data.root != null
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue