no message
This commit is contained in:
parent
e52e986d3b
commit
59d426f5d5
1 changed files with 2 additions and 2 deletions
|
|
@ -192,7 +192,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
|
||||||
.leftJoinAndSelect("developmentHistory.development", "development")
|
.leftJoinAndSelect("developmentHistory.development", "development")
|
||||||
.leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
|
.leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
|
||||||
.leftJoinAndSelect("developmentHistory.posType", "posType")
|
.leftJoinAndSelect("developmentHistory.posType", "posType")
|
||||||
.andWhere("development.year = :year", { year: year })
|
.andWhere(year != 0 || year != null ? "development.year = :year" : "1=1", { year: year })
|
||||||
.andWhere("developmentHistory.type = :type", { type: type })
|
.andWhere("developmentHistory.type = :type", { type: type })
|
||||||
.andWhere(
|
.andWhere(
|
||||||
new Brackets((qb) => {
|
new Brackets((qb) => {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue