调整收款列表

application/index/controller/Finance.php

@@ -2936,15 +2936,31 @@ class Finance extends Basic
             }
             /*入账日期 end*/
 
+            //商铺ID
+            if (!empty($this->params['house_id'])) {
+                $where['e.house_id'] = $this->params['house_id'];
+                $is_show = 1;
+            }
+
             //商铺地址
             if (!empty($this->params['internal_address'])) {
-                $where['d.internal_address'] = ['like', '%' . $this->params['internal_address'] . '%'];
-                $is_show = 1;
+                $m_house = new GHouses();
+                $id = $m_house->getList(1, 20, 'id desc', 'id',['internal_address'=>['like', '%' . $this->params['internal_address'] . '%']]);
+//                $where['d.internal_address'] = ['like', '%' . $this->params['internal_address'] . '%'];
+
+                foreach ($id as $v) {
+                    $id_arr[] = $v['id'];
                 }
 
-            //商铺ID
-            if (!empty($this->params['house_id'])) {
-                $where['e.house_id'] = $this->params['house_id'];
+                if (!empty($where['e.house_id'])) {
+                    $id_arr[] = $where['e.house_id'];
+                }
+
+                if (!empty($id_arr)) {
+                    $id_arr = array_unique($id_arr);
+                    $id_str = implode(',', $id_arr);
+                    $where['e.house_id'] = $id_str;
+                }
                 $is_show = 1;
             }