优化

application/model/GHousesImgs.php

@@ -95,8 +95,9 @@ class GHousesImgs extends BaseModel
     public function edit($params, $house_id) {
         try {
             //编辑图片
-            $house_img_data = $this->field('id,img_name,img_type')
-                ->where('img_status <> 1 AND house_id = ' . $house_id)->select();
+            $where['img_status'] = ['<>', 1];
+            $where['house_id'] = $house_id;
+            $house_img_data = $this->getListAll('id,img_name,img_type', $where);
             $key = 0;
             $house_img_edit = array();
             $slide_show = $params['slide_show'];
@@ -104,81 +105,87 @@ class GHousesImgs extends BaseModel
             $exclusive_img = $params['exclusive_img'];
 
             foreach ($house_img_data as $k => $v) {
-                //1列表页封面图
-                if ($v->img_type == 1) {
-                    if ($params['cover'] != $v->img_name) {
-                        /*伪删除之前的图片*/
-                        $house_img_edit[$key]['id'] = $v->id;
-                        $house_img_edit[$key]['img_status'] = 1;
-                        $key++;
-                    } else {
-                        /*提交图片相同清除提交的图片*/
-                        $params['cover'] = 0;
-                    }
-                }
-
-                //2详情页轮播图
-                if ($v->img_type == 2) {
-                    if ($slide_show != '') {
-                        foreach ($slide_show as $kk => $vv) {
-                            if (in_array($v->img_name,$slide_show)) {
-                                $params['slide_show'] = del_array_string($v->img_name, $params['slide_show']);
+                switch ($v['img_type']) {
+                    case 1 :
+                        //1列表页封面图
+                        if (isset($params['cover'])) {
+                            if ($params['cover'] != $v->img_name) {
+                                /*伪删除之前的图片*/
+                                $house_img_edit[$key]['id'] = $v->id;
+                                $house_img_edit[$key]['img_status'] = 1;
+                                $key++;
+                            } else {
+                                /*提交图片相同清除提交的图片*/
+                                $params['cover'] = 0;
+                            }
+                        }
+                        break;
+                    case 2 :
+                        //2详情页轮播图
+                        if (isset($params['slide_show'])) {
+                            if (empty($slide_show)) {
+                                foreach ($slide_show as $kk => $vv) {
+                                    if (in_array($v->img_name,$slide_show)) {
+                                        $params['slide_show'] = del_array_string($v->img_name, $params['slide_show']);
+                                    } else {
+                                        $house_img_edit[$key]['id'] = $v->id;
+                                        $house_img_edit[$key]['img_status'] = 1;
+                                        $key++;
+                                    }
+                                }
                             } else {
+                                //伪删除全部的轮播图
                                 $house_img_edit[$key]['id'] = $v->id;
                                 $house_img_edit[$key]['img_status'] = 1;
                                 $key++;
                             }
                         }
-                    } else {
-                        //伪删除全部的轮播图
-                        $house_img_edit[$key]['id'] = $v->id;
-                        $house_img_edit[$key]['img_status'] = 1;
-                        $key++;
-                    }
-                }
-
-                //3楼层平面图
-                if ($v->img_type == 3) {
-                    if ($plan != '') {
-                        foreach ($plan as $kk => $vv) {
-                            if (in_array($v->img_name,$plan)) {
-                                $params['plan'] = del_array_string($v->img_name, $params['plan']);
+                        break;
+                    case 3 :
+                        //3楼层平面图
+                        if (isset($params['plan'])) {
+                            if (empty($plan)) {
+                                foreach ($plan as $kk => $vv) {
+                                    if (in_array($v->img_name,$plan)) {
+                                        $params['plan'] = del_array_string($v->img_name, $params['plan']);
+                                    } else {
+                                        $house_img_edit[$key]['id'] = $v->id;
+                                        $house_img_edit[$key]['img_status'] = 1;
+                                        $key++;
+                                    }
+                                }
                             } else {
+                                //伪删除全部的平面图
                                 $house_img_edit[$key]['id'] = $v->id;
                                 $house_img_edit[$key]['img_status'] = 1;
                                 $key++;
                             }
                         }
-                    } else {
-                        //伪删除全部的平面图
-                        $house_img_edit[$key]['id'] = $v->id;
-                        $house_img_edit[$key]['img_status'] = 1;
-                        $key++;
-                    }
-                }
-
-                //4独家合同
-                if ($v->img_type == 4) {
-                    if ($exclusive_img != '') {
-                        foreach ($exclusive_img as $kk => $vv) {
-                            if (in_array($v->img_name,$exclusive_img)) {
-                                $params['exclusive_img'] = del_array_string($v->img_name, $params['exclusive_img']);
+                        break;
+                    case 4 :
+                        //4独家合同
+                        if (isset($params['exclusive_img'])) {
+                            if (!empty($exclusive_img)) {
+                                foreach ($exclusive_img as $kk => $vv) {
+                                    if (in_array($v->img_name,$exclusive_img)) {
+                                        $params['exclusive_img'] = del_array_string($v->img_name, $params['exclusive_img']);
+                                    } else {
+                                        $house_img_edit[$key]['id'] = $v->id;
+                                        $house_img_edit[$key]['img_status'] = 1;
+                                        $key++;
+                                    }
+                                }
                             } else {
+                                //伪删除全部的独家图片
                                 $house_img_edit[$key]['id'] = $v->id;
                                 $house_img_edit[$key]['img_status'] = 1;
                                 $key++;
                             }
                         }
-                    } else {
-                        //伪删除全部的独家图片
-                        $house_img_edit[$key]['id'] = $v->id;
-                        $house_img_edit[$key]['img_status'] = 1;
-                        $key++;
-                    }
+                        break;
                 }
             }
 
-
             $this->add($params, $house_id);
             $this->saveAll($house_img_edit);
             $result['status'] = 'successful';