From 9c194ae17f5e9e4b24f1251c51e521fe9fba9cba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 13 Nov 2021 18:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonReportTable/commonReportTable.js    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/components/property/commonReportTable/commonReportTable.js b/public/components/property/commonReportTable/commonReportTable.js
index b82503548..ad0ada42b 100644
--- a/public/components/property/commonReportTable/commonReportTable.js
+++ b/public/components/property/commonReportTable/commonReportTable.js
@@ -22,7 +22,7 @@
                 $that._listReportCustomTableComponent();
             })
             vc.on('commonReportTable', 'paginationPlus', 'page_event', function (_currentPage) {
-                vc.component._listReportCustomTableDatas(_currentPage, DEFAULT_ROWS,$that.commonReportTableInfo.components[0]);
+                vc.component._listReportCustomTableDatas(_currentPage, DEFAULT_ROWS, $that.commonReportTableInfo.components[0]);
             });
         },
         methods: {
@@ -59,17 +59,12 @@
                 );
             },
             _listReportCustomTableConditions: function (_component) {
-                let _community = vc.getCurrentCommunity();
-                let _communityId = '';
-                if (_community) {
-                    _communityId = _community.communityId
-                }
+
                 let param = {
                     params: {
                         page: 1,
                         row: 50,
-                        componentId: _component.componentId,
-                        communityId: _communityId
+                        componentId: _component.componentId
                     }
                 };
                 //发送get请求
@@ -86,15 +81,22 @@
 
             },
             _listReportCustomTableDatas: function (_page, _row, _component, _conditions) {
+                let _community = vc.getCurrentCommunity();
+                let _communityId = '';
+                if (_community) {
+                    _communityId = _community.communityId
+                }
                 if (_conditions) {
                     _conditions.page = _page;
                     _conditions.row = _row;
                     _conditions.componentId = _component.componentId;
+                    _conditions.communityId = _communityId
                 } else {
                     _conditions = {
                         page: _page,
                         row: _row,
-                        componentId: _component.componentId
+                        componentId: _component.componentId,
+                        communityId: _communityId
                     }
                 }
                 let param = {