fix: group approval pr by nik
This commit is contained in:
@ -1655,7 +1655,11 @@ class PoAdapter extends Adapter {
|
|||||||
// let nik = req.body.nik;
|
// let nik = req.body.nik;
|
||||||
|
|
||||||
let qry = "select * from vw_po ";
|
let qry = "select * from vw_po ";
|
||||||
qry = qry + "where trim(ponumber) like '%" + keyword + "%' and ponumber<>'000' and status in (1,2,3,4,5,6)";
|
qry =
|
||||||
|
qry +
|
||||||
|
"where trim(ponumber) like '%" +
|
||||||
|
keyword +
|
||||||
|
"%' and ponumber<>'000' and status in (1,2,3,4,5,6)";
|
||||||
// qry = qry +"order by _idx asc limit " + offset + ", " + limit;
|
// qry = qry +"order by _idx asc limit " + offset + ", " + limit;
|
||||||
|
|
||||||
// console.log(qry);
|
// console.log(qry);
|
||||||
@ -1708,9 +1712,13 @@ class PoAdapter extends Adapter {
|
|||||||
async queryPottdList(req, callback) {
|
async queryPottdList(req, callback) {
|
||||||
var apires = this.getApiResultDefined();
|
var apires = this.getApiResultDefined();
|
||||||
try {
|
try {
|
||||||
|
const proc_nik = process.env.PROC_USER_NIK ?? "";
|
||||||
|
const proc_users = proc_nik.split(",");
|
||||||
|
|
||||||
let limit = req.query.limit;
|
let limit = req.query.limit;
|
||||||
let offset = req.query.offset;
|
let offset = req.query.offset;
|
||||||
let keyword = req.query.keyword;
|
let keyword = req.query.keyword;
|
||||||
|
let nik = req.query.nik;
|
||||||
// let nik = req.body.nik;
|
// let nik = req.body.nik;
|
||||||
|
|
||||||
let qry = "select * from vw_po ";
|
let qry = "select * from vw_po ";
|
||||||
@ -1719,9 +1727,13 @@ class PoAdapter extends Adapter {
|
|||||||
"where trim(ponumber) like '%" +
|
"where trim(ponumber) like '%" +
|
||||||
keyword +
|
keyword +
|
||||||
"%' and status in(1,2,3,4,5,6) and ponumber<>'000' and ponumber<>'' ";
|
"%' and status in(1,2,3,4,5,6) and ponumber<>'000' and ponumber<>'' ";
|
||||||
// qry = qry +"order by _idx asc limit " + offset + ", " + limit;
|
|
||||||
|
|
||||||
console.log(qry);
|
if (nik) {
|
||||||
|
if (!proc_users.includes(nik)) {
|
||||||
|
qry += 'and (iby="' + nik + ' or nikapproval="' + nik + '")';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
db.query(qry, [], function (err, result, fields) {
|
db.query(qry, [], function (err, result, fields) {
|
||||||
if (err) {
|
if (err) {
|
||||||
apires.meta["message"] = err.toString();
|
apires.meta["message"] = err.toString();
|
||||||
@ -1745,6 +1757,12 @@ class PoAdapter extends Adapter {
|
|||||||
"where trim(ponumber) like '%" +
|
"where trim(ponumber) like '%" +
|
||||||
keyword +
|
keyword +
|
||||||
"%' and status in(1,2,3,4,5,6) and ponumber<>'000' and ponumber<>'' ";
|
"%' and status in(1,2,3,4,5,6) and ponumber<>'000' and ponumber<>'' ";
|
||||||
|
if (nik) {
|
||||||
|
if (!proc_users.includes(nik)) {
|
||||||
|
qry += 'and (iby="' + nik + ' or nikapproval="' + nik + '") ';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
qry = qry + "order by _idx asc limit " + offset + ", " + limit;
|
qry = qry + "order by _idx asc limit " + offset + ", " + limit;
|
||||||
db.query(qry, [], function (err, result, fields) {
|
db.query(qry, [], function (err, result, fields) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|||||||
Reference in New Issue
Block a user