diff --git a/src/controllers/ApiManageController.ts b/src/controllers/ApiManageController.ts index 6a6e4247..295fed4c 100644 --- a/src/controllers/ApiManageController.ts +++ b/src/controllers/ApiManageController.ts @@ -337,6 +337,7 @@ export class ApiManageController extends Controller { @Query("pageSize") pageSize: number = 10, @Query() keyword: string = "", @Query() system: "registry" | "registry_emp" | "registry_temp" | "organization" | "" = "", + @Query() isActive: boolean = true, ): Promise { try { if (!req.user.role.includes("SUPER_ADMIN")) { @@ -346,6 +347,7 @@ export class ApiManageController extends Controller { const queryBuilder = AppDataSource.getRepository(ApiName) .createQueryBuilder("apiName") + .where("apiName.isActive = :isActive", { isActive: isActive ?? true }) .select([ "apiName.id", "apiName.name", @@ -359,7 +361,7 @@ export class ApiManageController extends Controller { ]); if (keyword?.trim()) { - queryBuilder.where( + queryBuilder.andWhere( "(apiName.name LIKE :keyword OR apiName.code LIKE :keyword OR apiName.pathApi LIKE :keyword)", { keyword: `%${keyword.trim()}%` }, );