doomiwork 3.7.2 → 3.7.4

package/core/controller.js

@@ -80,10 +80,10 @@ class controller {
             result = await instance.afterCRUD(result,actionType,datakey,url,req,res)
 
             //CJJ add
-            if (req.query.exportexcel === 'true' && result.buffer && result.successed) {
-                res.attachment('export.xlsx');
-                return res.end(result.buffer);
-            }
+            // if (req.query.exportexcel === 'true' && result.buffer && result.successed) {
+            //     res.attachment('export.xlsx');
+            //     return res.end(result.buffer);
+            // }
             return res.json(result)
         })
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {

package/utilities/requestparser.js

@@ -66,7 +66,7 @@ class RequestParser {
                     keyValue = '1=0'
                 }
             } else {  ////数组形式的参数，目前框架不支持，统一认为为sql注入攻击,全部忽略
-                console.log(`参数非法==>类型${typeof (keyValue)}:${matchValue} = ${keyValue}`)
+                // console.log(`参数非法==>类型${typeof (keyValue)}:${matchValue} = ${keyValue}`)
                 parseKeyWordIsNull = true;
                 keyValue = ''
             }
@@ -161,10 +161,10 @@ class RequestParser {
                 req.footerMapping = req.dataConfig.list.footer;
                 /**解析查询条件 */
                 req.searchCondition = this.getSearchCondition({ request: req, refer: req.dataConfig.list.search });
-                /**排序方式 */// req.sort || //稍后恢复
-                req.sort = req.dataConfig.list.sort;
-                /**来自req请求参数中的过滤条件 */  //稍后恢复
-                let clientFilter = '';// this.checkSqlInjection(this.parseAndReplaceSql(req,req.query.clientFilter),false);
+                /**排序方式 *///
+                req.sort = req.sort || req.dataConfig.list.sort;
+                /**来自req请求参数中的过滤条件 */ 
+                let clientFilter =  this.checkSqlInjection(this.parseAndReplaceSql(req,req.query.clientFilter),false);
 
                 let listsql = '';
                 ///是否有列表尾部的统计SQL