From 2b94f86909c1d979f3dd62dbf87dca3cfa0d0bba Mon Sep 17 00:00:00 2001
From: anyv <anyu@bronet.cn>
Date: Mon, 17 Jun 2019 15:59:09 +0800
Subject: [PATCH] 5

---
 app/portal/controller/IndexController.php  | 24 ++++++++++++------------
 app/portal/controller/SchoolController.php |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/portal/controller/IndexController.php b/app/portal/controller/IndexController.php
index 4d71cce..a784829 100644
--- a/app/portal/controller/IndexController.php
+++ b/app/portal/controller/IndexController.php
@@ -53,7 +53,7 @@ class IndexController extends WeChatBaseController
                         $data_update['bind_time'] = time();
                         $data_update['bind_status'] = 1;
                         Db::name('my_user') -> where('uid',$uid) -> update($data_update);
-                        $data_goods = Db::name('goods') -> where('uid',$my_user_phone['uid']) -> limit(3) -> select() -> toArray();
+                        $data_goods = Db::name('goods') -> where('uid',$my_user_phone['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                     }elseif ($data_id['status_id'] == 3){
                         //老师分享 更改用户身份为学生
                         $my_user_phone = Db::name('my_user') -> where('id',$data_id['my_user_id']) -> find();
@@ -65,7 +65,7 @@ class IndexController extends WeChatBaseController
                         $data_update['bind_status'] = 1;
                         Db::name('my_user') -> where('uid',$uid) -> update($data_update);
                         $salesman_id = Db::name('my_user') -> where('id',$my_user_phone['pid']) -> find();
-                        $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> limit(3) -> select() -> toArray();
+                        $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                     }
                 }
             }else{
@@ -84,42 +84,42 @@ class IndexController extends WeChatBaseController
                                 $data_update['bind_time'] = time();
                                 $data_update['bind_status'] = 1;
                                 Db::name('my_user') -> where('uid',$uid) -> update($data_update);
-                                $data_goods = Db::name('goods') -> where('uid',$my_user_phone['uid']) -> limit(3) -> select() -> toArray();
+                                $data_goods = Db::name('goods') -> where('uid',$my_user_phone['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                             }else{
                                 $salesman_id = Db::name('my_user') -> where('id',$data_my_user['pid']) -> find();
-                                $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> limit(3) -> select() -> toArray();
+                                $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                             }
                         }else{
                             $salesman_id = Db::name('my_user') -> where('id',$data_my_user['pid']) -> find();
-                            $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> limit(3) -> select() -> toArray();
+                            $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                         }
                     }else{
                         //当为业务员时显示的数据
                         if($data_my_user['status'] == 2){
-                            $data_goods = Db::name('goods') -> where('uid',$data_my_user['uid']) -> limit(3) -> select() -> toArray();
+                            $data_goods = Db::name('goods') -> where('uid',$data_my_user['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                         }
                         //当为学生时显示的数据
                         if($data_my_user['status'] == 4){
                             $teacher_id = Db::name('my_user') -> where('id',$data_my_user['pid']) -> find();
                             $salesman_id = Db::name('my_user') -> where('id',$teacher_id['pid']) -> find();
-                            $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> limit(3) -> select() -> toArray();
+                            $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                         }
                     }
                 }else{
                     //当为业务员时显示的数据
                     if($data_my_user['status'] == 2){
-                        $data_goods = Db::name('goods') -> where('uid',$data_my_user['uid']) -> limit(3) -> select() -> toArray();
+                        $data_goods = Db::name('goods') -> where('uid',$data_my_user['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                     }
                     //当为老师时显示的数据
                     if($data_my_user['status'] == 3){
                         $salesman_id = Db::name('my_user') -> where('id',$data_my_user['pid']) -> find();
-                        $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> limit(3) -> select() -> toArray();
+                        $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                     }
                     //当为学生时显示的数据
                     if($data_my_user['status'] == 4){
                         $teacher_id = Db::name('my_user') -> where('id',$data_my_user['pid']) -> find();
                         $salesman_id = Db::name('my_user') -> where('id',$teacher_id['pid']) -> find();
-                        $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> limit(3) -> select() -> toArray();
+                        $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                     }
                 }
 
@@ -142,7 +142,7 @@ class IndexController extends WeChatBaseController
                     $data_inser['bind_time'] = time();
                     $data_inser['bind_status'] = 1;
                     Db::name('my_user') -> insert($data_inser);
-                    $data_goods = Db::name('goods') -> where('uid',$my_user_phone['uid']) -> limit(3) -> select() -> toArray();
+                    $data_goods = Db::name('goods') -> where('uid',$my_user_phone['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                 }elseif ($data_id['status_id'] == 3){
                     //老师分享 添加学生
                     $my_user_phone = Db::name('my_user') -> where('id',$data_id['my_user_id']) -> find();
@@ -156,7 +156,7 @@ class IndexController extends WeChatBaseController
                     $data_inser['bind_status'] = 1;
                     Db::name('my_user') -> insert($data_inser);
                     $salesman_id = Db::name('my_user') -> where('id',$my_user_phone['pid']) -> find();
-                    $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> limit(3) -> select() -> toArray();
+                    $data_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> limit(3) -> select() -> toArray();
                 }
             }else{
                 $data_inser['status'] = 0;
diff --git a/app/portal/controller/SchoolController.php b/app/portal/controller/SchoolController.php
index a6b9db5..4b449b1 100644
--- a/app/portal/controller/SchoolController.php
+++ b/app/portal/controller/SchoolController.php
@@ -57,7 +57,6 @@ class SchoolController extends WeChatBaseController{
                                 $class_s = explode('-',$val1['class']);
                                 for($i=$class_s[0];$i<=$class_s[1];$i++){
                                     $class_db[] = $i;
-
                                 }
                                 //将传过来的班级循环
                                 for($j=$val2[1];$j<=$val2[2];$j++){
--
libgit2 0.24.0