delete comment
This commit is contained in:
parent
925c5d1ab2
commit
cbd57b86ab
3 changed files with 29 additions and 133 deletions
|
|
@ -47,21 +47,6 @@ export class DirectorController {
|
|||
@Query("keyword") keyword?: string,
|
||||
) {
|
||||
await new permission().PermissionList(request, "SYS_EVA_INFO");
|
||||
// const directors = await this.directorRepository.find({
|
||||
// skip: (page - 1) * pageSize,
|
||||
// take: pageSize,
|
||||
// });
|
||||
// if (keyword != undefined && keyword !== "") {
|
||||
// return directors.filter(
|
||||
// (x) =>
|
||||
// x.prefix?.includes(keyword) ||
|
||||
// x.firstName?.includes(keyword) ||
|
||||
// x.lastName?.includes(keyword) ||
|
||||
// x.position?.includes(keyword) ||
|
||||
// x.email?.includes(keyword) ||
|
||||
// x.phone?.includes(keyword),
|
||||
// );
|
||||
// }
|
||||
const directors = await AppDataSource.getRepository(Director)
|
||||
.createQueryBuilder("director")
|
||||
.andWhere(
|
||||
|
|
@ -74,30 +59,15 @@ export class DirectorController {
|
|||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "director.position LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
.orWhere(keyword != null && keyword != "" ? "director.position LIKE :keyword" : "1=1", {
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "director.email LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
})
|
||||
.orWhere(keyword != null && keyword != "" ? "director.email LIKE :keyword" : "1=1", {
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "director.phone LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
})
|
||||
.orWhere(keyword != null && keyword != "" ? "director.phone LIKE :keyword" : "1=1", {
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
);
|
||||
});
|
||||
}),
|
||||
)
|
||||
.orderBy("director.createdAt", "DESC")
|
||||
|
|
@ -115,21 +85,6 @@ export class DirectorController {
|
|||
@Query("pageSize") pageSize: number = 10,
|
||||
@Query("keyword") keyword?: string,
|
||||
) {
|
||||
// const directors = await this.directorRepository.find({
|
||||
// skip: (page - 1) * pageSize,
|
||||
// take: pageSize,
|
||||
// });
|
||||
// if (keyword != undefined && keyword !== "") {
|
||||
// return directors.filter(
|
||||
// (x) =>
|
||||
// x.prefix?.includes(keyword) ||
|
||||
// x.firstName?.includes(keyword) ||
|
||||
// x.lastName?.includes(keyword) ||
|
||||
// x.position?.includes(keyword) ||
|
||||
// x.email?.includes(keyword) ||
|
||||
// x.phone?.includes(keyword),
|
||||
// );
|
||||
// }
|
||||
const directors = await AppDataSource.getRepository(Director)
|
||||
.createQueryBuilder("director")
|
||||
.andWhere(
|
||||
|
|
@ -142,30 +97,15 @@ export class DirectorController {
|
|||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "director.position LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
.orWhere(keyword != null && keyword != "" ? "director.position LIKE :keyword" : "1=1", {
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "director.email LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
})
|
||||
.orWhere(keyword != null && keyword != "" ? "director.email LIKE :keyword" : "1=1", {
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "director.phone LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
})
|
||||
.orWhere(keyword != null && keyword != "" ? "director.phone LIKE :keyword" : "1=1", {
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
);
|
||||
});
|
||||
}),
|
||||
)
|
||||
.orderBy("director.createdAt", "DESC")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue