商铺列表搜索

application/index/controller/Houses.php

@@ -199,6 +199,7 @@ class Houses extends Basic
             $where['industry_type'] = ['LIKE',$params['industry_type'].'%'];
         }
 
+        //案场权限人搜索
         if (empty($params['dish'])) {
             /*楼盘编号*/
             if ($params['id'] != NULL) {
@@ -208,12 +209,14 @@ class Houses extends Basic
             $data['data']['list'] = $this->house->getHouseList($pageNo, $pageSize, 'id DESC', $fields, $where);
             $data['data']['total'] = $this->house->getTotal($where);
         } else {
+            //盘方人搜索
             /*楼盘编号*/
             if ($params['id'] != NULL) {
                 $where['a.id'] = $params['id'];
             }
             $where['a.status'] = ['<>',2];
             $where['c.name'] = ['LIKE',$params['dish'].'%'];
+            $where['b.type'] = ['=',1];
             $data['data']['list'] = $this->house->getHouseListDish($pageNo, $pageSize, 'a.id DESC', $fields, $where);
             $data['data']['total'] = $this->house->getHouseListDishTotal($where);
         }

application/model/GHouses.php

@@ -73,16 +73,9 @@ class GHouses extends BaseModel
         if (empty($house_id)) {
             $result = $data;
         } else {
-            /*案场权限人*/
+            /*案场权限人和盘方*/
             $house_agents = Db::table('g_houses_to_agents')->alias('a')
-                ->field('a.houses_id,b.id,b.name,b.phone')
-                ->join('a_agents b', 'a.agents_id=b.id','left')
-                ->where('a.houses_id','IN', implode(',',$house_id))
-                ->select();
-
-            /*盘方*/
-            $house_dish = Db::table('g_houses_dish')->alias('a')
-                ->field('a.houses_id,b.id,b.name,b.phone')
+                ->field('a.houses_id,b.id,b.name,b.phone,a.type')
                 ->join('a_agents b', 'a.agents_id=b.id','left')
                 ->where('a.houses_id','IN', implode(',',$house_id))
                 ->select();
@@ -91,17 +84,16 @@ class GHouses extends BaseModel
                 $result[$k] = $v->toArray();
                 foreach ($house_agents as $k2 => $v2) {
                     if ($v->id == $v2['houses_id']) {
-                        $result[$k]['agents_name'][$k2]['id'] = $v2['id'];
-                        $result[$k]['agents_name'][$k2]['name'] = $v2['name'];
-                        $result[$k]['agents_name'][$k2]['phone'] = $v2['phone'];
-                    }
-                }
-
-                foreach ($house_dish as $k3 => $v3) {
-                    if ($v->id == $v3['houses_id']) {
-                        $result[$k]['dish_name'][$k3]['id'] = $v3['id'];
-                        $result[$k]['dish_name'][$k3]['name'] = $v3['name'];
-                        $result[$k]['dish_name'][$k3]['phone'] = $v3['phone'];
+                        if ($v2['type'] == 0) {
+                            $result[$k]['agents_name'][$k2]['id'] = $v2['id'];
+                            $result[$k]['agents_name'][$k2]['name'] = $v2['name'];
+                            $result[$k]['agents_name'][$k2]['phone'] = $v2['phone'];
+                        }
+                        if ($v2['type'] == 1) {
+                            $result[$k]['dish_name'][$k2]['id'] = $v2['id'];
+                            $result[$k]['dish_name'][$k2]['name'] = $v2['name'];
+                            $result[$k]['dish_name'][$k2]['phone'] = $v2['phone'];
+                        }
                     }
                 }
             }
@@ -125,7 +117,7 @@ class GHouses extends BaseModel
      */
     public function getHouseListDish($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '') {
         $data = $this->field($field)->alias('a')
-            ->join('g_houses_dish b', 'a.id=b.houses_id','left')
+            ->join('g_houses_to_agents b', 'a.id=b.houses_id','left')
             ->join('a_agents c','b.agents_id=c.id','left')
             ->where($params)
             ->order($order_)
@@ -141,16 +133,9 @@ class GHouses extends BaseModel
         if (empty($house_id)) {
             $result = $data;
         } else {
-            /*案场权限人*/
+            /*案场权限人和盘方*/
             $house_agents = Db::table('g_houses_to_agents')->alias('a')
-                ->field('a.houses_id,b.id,b.name,b.phone')
-                ->join('a_agents b', 'a.agents_id=b.id','left')
-                ->where('a.houses_id','IN', implode(',',$house_id))
-                ->select();
-
-            /*盘方*/
-            $house_dish = Db::table('g_houses_dish')->alias('a')
-                ->field('a.houses_id,b.id,b.name,b.phone')
+                ->field('a.houses_id,b.id,b.name,b.phone,a.type')
                 ->join('a_agents b', 'a.agents_id=b.id','left')
                 ->where('a.houses_id','IN', implode(',',$house_id))
                 ->select();
@@ -159,17 +144,16 @@ class GHouses extends BaseModel
                 $result[$k] = $v->toArray();
                 foreach ($house_agents as $k2 => $v2) {
                     if ($v->id == $v2['houses_id']) {
-                        $result[$k]['agents_name'][$k2]['id'] = $v2['id'];
-                        $result[$k]['agents_name'][$k2]['name'] = $v2['name'];
-                        $result[$k]['agents_name'][$k2]['phone'] = $v2['phone'];
-                    }
-                }
-
-                foreach ($house_dish as $k3 => $v3) {
-                    if ($v->id == $v3['houses_id']) {
-                        $result[$k]['dish_name'][$k3]['id'] = $v3['id'];
-                        $result[$k]['dish_name'][$k3]['name'] = $v3['name'];
-                        $result[$k]['dish_name'][$k3]['phone'] = $v3['phone'];
+                        if ($v2['type'] == 0) {
+                            $result[$k]['agents_name'][$k2]['id'] = $v2['id'];
+                            $result[$k]['agents_name'][$k2]['name'] = $v2['name'];
+                            $result[$k]['agents_name'][$k2]['phone'] = $v2['phone'];
+                        }
+                        if ($v2['type'] == 1) {
+                            $result[$k]['dish_name'][$k2]['id'] = $v2['id'];
+                            $result[$k]['dish_name'][$k2]['name'] = $v2['name'];
+                            $result[$k]['dish_name'][$k2]['phone'] = $v2['phone'];
+                        }
                     }
                 }
             }
@@ -185,7 +169,7 @@ class GHouses extends BaseModel
      */
     public function getHouseListDishTotal($params = '') {
         $data = $this->alias('a')
-            ->join('g_houses_dish b', 'a.id=b.houses_id','left')
+            ->join('g_houses_to_agents b', 'a.id=b.houses_id','left')
             ->join('a_agents c','b.agents_id=c.id','left')
             ->where($params)
             ->count();