zet-lib 1.0.59 → 1.0.60

package/lib/zRoute.js

@@ -1566,29 +1566,25 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   const columns = Object.prototype.hasOwnProperty.call(objData, 'columns') ? objData.columns : body.columns
   let whereArray = []
   if (objData.hasOwnProperty('whereArray')) {
-    if (typeof objData.whereArray === 'object') {
-      whereArray = objData.whereArray
-    } else if (typeof objData.whereArray) {
-      whereArray = objData.whereArray(req, res)
-    }
-  } else {
-    whereArray.push({
-      field: 'company_id',
-      option: '=',
-      value: res.locals.companyId,
-      operator: 'AND',
-    })
-    columns.forEach(function (item) {
-      if (item.search.value) {
-        whereArray.push({
-          field: fields[item.data],
-          option: MYMODEL.options[fields[item.data]],
-          value: item.search.value,
-          operator: 'AND',
-        })
-      }
-    })
+    whereArray.push(objData['whereArray'])
   }
+
+  whereArray.push({
+    field: 'company_id',
+    option: '=',
+    value: res.locals.companyId,
+    operator: 'AND',
+  })
+  columns.forEach(function (item) {
+    if (item.search.value) {
+      whereArray.push({
+        field: fields[item.data],
+        option: MYMODEL.options[fields[item.data]],
+        value: item.search.value,
+        operator: 'AND',
+      })
+    }
+  })
   const orderColumn = fields[body.order[0].column] == 'actionColumn' ? 'id' : fields[body.order[0].column] == 'no' ? 'id' : fields[body.order[0].column] == 'actionColum' ? 'id' : fields[body.order[0].column]
   const rows = await connection.results({
     select: select,
@@ -1604,7 +1600,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
     whereArray: whereArray,
   })
   let datas = []
-  const zRole = objData.zRole || {}
+  const zRole = objData.zRole || require('./zRole')
   const levels = objData.hasOwnProperty('levels') ? objData.levels : zRole.myLevel(req, res, MYMODEL.table)
   if (objData.hasOwnProperty('datas')) {
     datas = objData.datas(body, rows, fields, relations, levels)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.0.59",
+  "version": "1.0.60",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"