fix bug

Application/Admin/Controller/InveController.class.php

@@ -16,7 +16,7 @@ class InveController extends AdminController
         $order=M('order');
         $where['order_type']=2;
         $where['type']=2;
-        $where['group_id']=$this->group_id;
+//        $where['group_id']=$this->group_id;
         if(isset($_GET['order_num'])||!empty($_GET['order_num'])){
             $where['order_num']=array('LIKE','%'.$_GET['order_num'].'%');
         }
@@ -33,14 +33,14 @@ class InveController extends AdminController
             ->select();//查出总订单信息
         //获取仓库订单商品
         $order_goods=M('order_goods');
-        $where2['yi_order_goods.group_id']=$this->group_id;//查询分仓id
+//        $where2['yi_order_goods.group_id']=$this->group_id;//查询分仓id
         foreach($order_info as $key=>$v){
             $where2['order_id']=$v['id'];//订单id 作为条件
             $where2['yi_order_goods.status']=2;//待发货订单
             $goods_info=$order_goods->where($where2)
                 ->field('yi_order_goods.*,z_img,title,goods_model,number')
                 ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id')
-                ->join('yi_goods_group gg on yi_goods.id=gg.goods_id and gg.group_id='.$this->group_id)
+                ->join('yi_goods_group gg on yi_goods.id=gg.goods_id')
                 ->select();
             $order_info[$key]['o_status']=$goods_info[0]['status'];
             $order_info[$key]['goods']=$goods_info;
@@ -64,7 +64,7 @@ class InveController extends AdminController
         $order=M('order');
         $where['order_type']=6;
         $where['type']=2;
-        $where['group_id']=$this->group_id;
+//        $where['group_id']=$this->group_id;
         if(isset($_GET['order_num'])||!empty($_GET['order_num'])){
             $where['order_num']=array('LIKE','%'.$_GET['order_num'].'%');
         }
@@ -81,14 +81,15 @@ class InveController extends AdminController
             ->select();//查出总订单信息
         //获取仓库订单商品
         $order_goods=M('order_goods');
-        $where2['yi_order_goods.group_id']=$this->group_id;//查询分仓id
+//        $where2['yi_order_goods.group_id']=$this->group_id;//查询分仓id
         foreach($order_info as $key=>$v){
             $where2['order_id']=$v['id'];//订单id 作为条件
             $where2['yi_order_goods.status']=4;//已完成交易
             $goods_info=$order_goods->where($where2)
                 ->field('yi_order_goods.*,z_img,title,goods_model,number')
                 ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id')
-                ->join('yi_goods_group gg on yi_goods.id=gg.goods_id and gg.group_id='.$this->group_id)
+//                ->join('yi_goods_group gg on yi_goods.id=gg.goods_id and gg.group_id='.$this->group_id)
+                ->join('yi_goods_group gg on yi_goods.id=gg.goods_id')
                 ->select();
             $order_info[$key]['o_status']=$goods_info[0]['status'];
             $order_info[$key]['goods']=$goods_info;
@@ -164,11 +165,15 @@ class InveController extends AdminController
         if(IS_GET){
             $rows=$order->where('id='.$_GET['id'])->find();//主订单信息
             if($rows){
-                $goods_list=$order_goods->where('order_id='.$_GET['id'])//获取订单里面的商品信息
+                $order_goods_model=$order_goods->where('order_id='.$_GET['id'])//获取订单里面的商品信息
                 ->field('yi_order_goods.*,z_img,title,number')
-                    ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id and yi_order_goods.group_id='.$this->group_id)
-                    ->join('yi_goods_group gg on yi_order_goods.goods_id=gg.goods_id and gg.group_id=yi_order_goods.group_id')
-                    ->select();
+                    ->join('yi_goods_group gg on yi_order_goods.goods_id=gg.goods_id and gg.group_id=yi_order_goods.group_id');
+                if (is_administrator()) {
+                    $order_goods_model->join('yi_goods on yi_order_goods.goods_id=yi_goods.id');
+                } else {
+                    $order_goods_model->join('yi_goods on yi_order_goods.goods_id=yi_goods.id and yi_order_goods.group_id='.$this->group_id);
+                }
+                $goods_list = $order_goods_model->select();
                 $rows['s_price']=0;
                 foreach($goods_list as $v){//计算订单总价
                     $rows['s_price']+=$v['s_price'];
@@ -254,7 +259,9 @@ class InveController extends AdminController
     //获取物流信息
     private function getLogistics($order_num,$group_id,$dist_id = null){
         $where['order_num']=$order_num;
-        $where['group_id']=$group_id;
+        if (!is_administrator()) {
+            $where['group_id']=$group_id;
+        }
         $where['dist_id']=$dist_id;
         $logistics=M('logistics');
         $info=$logistics->where($where)->find();

Application/Admin/View/OrderS/index.html

@@ -50,7 +50,6 @@
             </div>
         </div>
     </div>
-
     <div class="data-table table-striped">
         <table class="">
             <thead>
@@ -97,7 +96,7 @@
                         <td>{$v.stan|default="无"}</td>
                         <td>{$v.title}</td>
                         <td>
-                            <eq name="vo.type" value="1">全配送</eq>
+                            <eq name="vo.type" value="1">立即购买</eq>
                             <eq name="vo.type" value="2">库存购</eq>
                         </td>
                         <td>

Application/Common/Common/function.php

@@ -467,6 +467,9 @@ function list_to_tree($list, $pk='id', $pid = 'pid', $child = '_child', $root =
         }
         foreach ($list as $key => $data) {
             // 判断是否存在parent
+            if (IS_ROOT && $data['id'] === "205") {
+                continue;
+            }
             $parentId =  $data[$pid];
             if ($root == $parentId) {
                 $tree[] =& $list[$key];