Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s
This commit is contained in:
commit
1e4f705b27
1 changed files with 8 additions and 0 deletions
|
|
@ -192,6 +192,14 @@ export class PersonalController extends Controller {
|
|||
|
||||
let query = await AppDataSource.getRepository(Personal)
|
||||
.createQueryBuilder("personal")
|
||||
.andWhere(
|
||||
status != undefined && status != null && status != ""
|
||||
? `personal.probation_status = :status`
|
||||
: "1=1",
|
||||
{
|
||||
status,
|
||||
},
|
||||
)
|
||||
.andWhere(
|
||||
_data.root != undefined && _data.root != null
|
||||
? _data.root[0] != null
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue