4

@@ -37,16 +37,19 @@ class SalesmanorderController extends AdminBaseController{
             if(!empty($_POST['grade'])){
                 $where['grade'] = $_POST['grade'];
             }
-            $data = Db::name('indent') -> where($where) -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
+            $data = Db::name('indent') -> where($where)  -> paginate(12);
             $data_arr = $data -> toArray();
         }else{
-            $data = Db::name('indent') -> where('indent_type',2) -> where("state = 2 or state = 3 or state = 5") -> paginate(12);
+            $data = Db::name('indent') -> where('indent_type',2) -> paginate(12);
             $data_arr = $data -> toArray();
         }
         $money = 0;
         foreach($data_arr['data'] as $key => $val){
-            $data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];
-            $money += $data_arr['data'][$key]['money'];
+            if($data_arr['state'] == 2 || $data_arr['state'] == 3 || $data_arr['state'] == 5){
+                $data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];
+                $money += $data_arr['data'][$key]['money'];
+            }
+
         }
         $data_school = Db::name('indent') -> group('school') -> where('indent_type',2) -> select() -> toArray();
         foreach($data_school as $key => $val){