verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

#6321 - Negative tickets #1945

Open
jsegarra wants to merge 93 commits from 6321_negative_tickets into dev
pull from: 6321_negative_tickets
merge into: verdnatura:dev
Conversation 0 Commits 93 Files Changed 28 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36297009e1 - Show all commits

6
modules/ticket/back/methods/ticket/itemLackDetail.js
View File

@ -87,10 +87,10 @@ module.exports = Self => {
[itemFk, 2]); [itemFk, 2]);
// if (filter.where.alertLevel) { // if (filter.where.alertLevel) {
// stmt.merge({ stmt.merge({
// sql: `AND ts.alertLevel=?`, params: ['FREE']}); sql: `AND ${filter.where.alertLevel ? '' : 'NOT'} ts.alertLevel=?`, params: [0]});
// } // }
// stmt.merge(conn.makeWhere(filter)); // stmt.merge(conn.makeWhere(filter.where));
const sql = ParameterizedSQL.join([stmt], ';'); const sql = ParameterizedSQL.join([stmt], ';');
const result = await conn.executeStmt(sql, myOptions); const result = await conn.executeStmt(sql, myOptions);
return result; return result;