Tcel-Eprocurement/backend-Eprocurement
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add filtering pr

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Iki
2026-05-15 15:31:55 +07:00
parent 707eb037cc
commit e548e1ead4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
adapter/pradapter.js
View File

@ -422,13 +422,13 @@ class PrAdapter extends Adapter {
if (nik) { if (nik) {
if (!proc_users.includes(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 = ""; let sdivision = "";
if (division && division.trim() !== "") { if (division && division.trim() !== "") {
sdivision = " and v.division = '" + division + "'"; sdivision = "v.division = '" + division + "'";
} }
let sorder = sort === "past" ? "id asc" : "id desc"; let sorder = sort === "past" ? "id asc" : "id desc";
@ -449,7 +449,12 @@ class PrAdapter extends Adapter {
if (status !== "-1") { if (status !== "-1") {
qry += "and v.status in(" + status + ") "; 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; // qry += "order by id asc limit " + offset + ", " + limit;
// console.log("qry paging => ", qry); // console.log("qry paging => ", qry);