doomiwork 4.1.8 → 4.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/utilities/requestparser.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "doomiwork",
3
- "version": "4.1.8",
3
+ "version": "4.1.9",
4
4
  "description": "doomisoft nodejs web framework",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/utilities/requestparser.js CHANGED
@@ -207,7 +207,7 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
207
207
  if (sqltype==='sql'){
208
208
  const mainParameterlizedSql = this.parseTagForParameterize(req, { pattern: sql, allowEmpty:true });
209
209
  if (!mainParameterlizedSql.sql) return null;
210
- sql = `${mainParameterlizedSql.sql} ${searchCondition.filter ||''} ${sort ? (' order by ' + sort) : ''} ${export2Excel ? '' : ' limit ' + Number(pageSize) + ' OFFSET ' + (Math.max(Number(page), 1) - 1) * Number(pageSize)};SELECT FOUND_ROWS() AS total`;
210
+ sql = `${mainParameterlizedSql.sql} ${searchCondition.filter ||''} ${sort ? (' order by ' + sort) : ''} ${export2Excel ? '' : ' limit ' + Number(pageSize) + ' OFFSET ' + (Math.max(Number(page), 1) - 1) * Number(pageSize)};SELECT FOUND_ROWS() AS total;`;
211
211
  SqlParameters = SqlParameters.concat(mainParameterlizedSql.params || [], searchCondition.params);
212
212
  /*** 如果存在汇总列的sql，则把SQL放置在最末尾 */
213
213
  if (countsql) {