From e548e1ead4c2fa2952f3f04efd39e9981f6ae6ff Mon Sep 17 00:00:00 2001 From: Iki Date: Fri, 15 May 2026 15:31:55 +0700 Subject: [PATCH] add filtering pr Co-authored-by: Copilot --- adapter/pradapter.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/adapter/pradapter.js b/adapter/pradapter.js index b91dfa6..0f617a6 100644 --- a/adapter/pradapter.js +++ b/adapter/pradapter.js @@ -422,13 +422,13 @@ class PrAdapter extends Adapter { if (nik) { if (!proc_users.includes(nik)) { - swherenik = '(v.iby="' + nik + '" or v.nikapproval="' + nik + '") and '; + swherenik = '(v.iby="' + nik + '" or v.nikapproval="' + nik + '")'; } } let sdivision = ""; if (division && division.trim() !== "") { - sdivision = " and v.division = '" + division + "'"; + sdivision = "v.division = '" + division + "'"; } let sorder = sort === "past" ? "id asc" : "id desc"; @@ -449,7 +449,12 @@ class PrAdapter extends Adapter { if (status !== "-1") { qry += "and v.status in(" + status + ") "; } - qry += "and " + swherenik + sdivision.substring(5); + if (swherenik) { + qry += "and " + swherenik + " "; + } + if (sdivision) { + qry += "and " + sdivision + " "; + } // qry += "order by id asc limit " + offset + ", " + limit; // console.log("qry paging => ", qry);