商铺列表修改

application/model/GHouses.php

@@ -163,11 +163,6 @@ class GHouses extends BaseModel
             ->select();
         $house_id = array();
         foreach ($data as $k => $v) {
-            if ($v['upload_id'] == $agents_id) {
-                $data[$k]['auth_edit_house'] = 1;
-            } else {
-                $data[$k]['auth_edit_house'] = 0;
-            }
             $house_id[$k]   = $v['id'];
             $v->create_time = date('Y-m-d', strtotime($v->create_time));
         }
@@ -176,15 +171,18 @@ class GHouses extends BaseModel
         if (empty($house_id)) {
             $result = $data;
         } else {
+            $house_id = array_unique($house_id);
             /*案场权限人和盘方*/
             $house_agents = Db::table('g_houses_to_agents')->alias('a')
                 ->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))
                 ->where('a.is_del', 0)
+                ->where('a.type',2)
                 ->select();
 
             foreach ($data as $k => $v) {
+
                 if ($v['upload_id'] == $agents_id) {
                     $data[$k]['auth_edit_house'] = 1;
                 } else {
@@ -194,13 +192,9 @@ class GHouses extends BaseModel
                 $dish_name               = '';
                 $result[$k]['dish_name'] = '';
                 foreach ($house_agents as $k2 => $v2) {
-                    if ($v->id == $v2['houses_id']) {
-                        if ($v2['type'] == 2) {
-                            $dish_name               .= $v2['name'] . ',';
-                            $result[$k]['dish_name'] = rtrim($dish_name, ',');
-                        } else {
-                            $result[$k]['dish_name'] = '';
-                        }
+                    if ($v['id'] == $v2['houses_id']) {
+                        $dish_name               .= $v2['name'] . ',';
+                        $result[$k]['dish_name'] = rtrim($dish_name, ',');
                     }
                 }
             }

public/resource/template/house_template_tpl.html

@@ -46,7 +46,7 @@
             [% } %]
         </td>
         <td>
-            [% if(check_auth('index/houseEdit')) { %]
+            [% if(it[item]['auth_edit_house'] || check_auth('index/houseEdit')) { %]
                 <a class="btn1 btn-success " href="/admin.php/index/houseEdit?id=[%= it[item]['id']%]" data-toggle="modal" >编辑</a>
             [% } %]