doomiwork 3.7.10 → 3.7.12

package/core/controller.js

@@ -37,6 +37,12 @@ class controller {
     }
     get router() { return this._router; }
     get baseUrl() { return null };
+    /**
+     * 权限的业务sql过滤
+     */
+    PermissonBusiness(req){
+        return null;
+    }
    /**
     * 导出数据到Excel 中
     * @param {*} data 
@@ -217,7 +223,7 @@ class controller {
             ///将从数据库中获得的结果集根据dataconfig中的配置进行映射转换
             let resultMapping = await parse.transferName2Mapping(result.rows, req.fieldsMapping);
             if (this._daoModel.hasPermissionControl) {
-                const accessResult = await this._daoModel.getDataPermissionSetting(req.params.id)
+                const accessResult = await this._daoModel.getDataPermissionSetting(req.params.id,this.PermissonBusiness(req))
                 if (accessResult.successed) {
                     resultMapping.data[0].managepermission = accessResult.managepermission;
                     resultMapping.data[0].consumepermission = accessResult.consumepermission;

package/core/database/daoBase.js

@@ -152,7 +152,7 @@ class mysqlDao extends dao{
      * 获取对应数据的权限设置
      * @param {*} id 
      */
-    async getDataPermissionSetting(id){
+    async getDataPermissionSetting(id,busSql){
         ///没有权限控制，则无需获取单条数据的权限因子
         if (!this.hasPermissionControl){
             return null;
@@ -223,6 +223,7 @@ class mysqlDao extends dao{
                             where 
                                 data_id=?
                             and data_type=? 
+                            ${busSql}
                             order by allow_type,allow_id
                             `
         return this.executeSql(sqlCommand, [id,this.tableoption.permissiondatatype])

package/package.json

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