search
This commit is contained in:
parent
22828d9dcf
commit
596083b8ee
1 changed files with 3 additions and 3 deletions
|
|
@ -20,7 +20,7 @@ import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
|
||||||
import { RequestWithUser } from "../middlewares/user";
|
import { RequestWithUser } from "../middlewares/user";
|
||||||
import { Profile } from "../entities/Profile";
|
import { Profile } from "../entities/Profile";
|
||||||
import { ProfileEmployee } from "../entities/ProfileEmployee";
|
import { ProfileEmployee } from "../entities/ProfileEmployee";
|
||||||
import { In, LessThan, MoreThan } from "typeorm";
|
import { In, IsNull, LessThan, MoreThan } from "typeorm";
|
||||||
import permission from "../interfaces/permission";
|
import permission from "../interfaces/permission";
|
||||||
import { setLogDataDiff } from "../interfaces/utils";
|
import { setLogDataDiff } from "../interfaces/utils";
|
||||||
import { TenurePositionOfficer } from "../entities/TenurePositionOfficer";
|
import { TenurePositionOfficer } from "../entities/TenurePositionOfficer";
|
||||||
|
|
@ -254,7 +254,7 @@ export class ProfileSalaryController extends Controller {
|
||||||
"14",
|
"14",
|
||||||
"15",
|
"15",
|
||||||
"16",
|
"16",
|
||||||
null,
|
IsNull(),
|
||||||
]),
|
]),
|
||||||
},
|
},
|
||||||
// order: { order: "ASC" },
|
// order: { order: "ASC" },
|
||||||
|
|
@ -298,7 +298,7 @@ export class ProfileSalaryController extends Controller {
|
||||||
"14",
|
"14",
|
||||||
"15",
|
"15",
|
||||||
"16",
|
"16",
|
||||||
null,
|
IsNull(),
|
||||||
]),
|
]),
|
||||||
},
|
},
|
||||||
// order: { order: "ASC" },
|
// order: { order: "ASC" },
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue