From 7b3b62e605ed261abd09f6e143e926c144c9b4ba Mon Sep 17 00:00:00 2001
From: 刘朕 <liuzhen@bronet.cn>
Date: Mon, 11 Nov 2019 11:16:48 +0800
Subject: [PATCH] 学校搜索优化
---
app/portal/controller/OrderSalesmanController.php | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/app/portal/controller/OrderSalesmanController.php b/app/portal/controller/OrderSalesmanController.php
index d2dabf9..15f63e1 100644
--- a/app/portal/controller/OrderSalesmanController.php
+++ b/app/portal/controller/OrderSalesmanController.php
@@ -49,6 +49,8 @@ class OrderSalesmanController extends WeChatBaseController
$user_id = $this->user_id;
if($this->status == 2){
$where['salesman_uid'] = ['eq',$user_id];
+ //获取当前业务员下级的所有老师
+ $user_ids = Db::name('my_user')->where(['pid'=>$this->pid])->column('uid');
}else{
//获取当前用户的所有下级
$user_child = Db::name('my_user')->where(['pid'=>$this->pid])->select();
@@ -80,11 +82,14 @@ class OrderSalesmanController extends WeChatBaseController
}
$this->assign('goods_count',$goods_count);
// 身份为老师，获取上级业务员的id
- $school_uid = $user_id;
- if($this->my_user['status'] == 3) {
+ $school = [];
+ if($this->my_user['status'] == 2) {
+ $user_ids[] = $user_id;
+ $school = Db::name('school')->whereIn('uid',$user_ids)->order('create_time desc')->select()->toArray();
+ } elseif($this->my_user['status'] == 3) {
$school_uid = Db::name('my_user')->where('id',$this->my_user['pid'])->value('uid');
+ $school = Db::name('school')->whereIn('uid',[$user_id,$school_uid])->order('create_time desc')->select()->toArray();
}
- $school = Db::name('school')->where('uid',$school_uid)->order('create_time desc')->select()->toArray();
if(count($school)!=0){
$schools = [];
foreach ($school as $key => $val){
@@ -387,6 +392,8 @@ class OrderSalesmanController extends WeChatBaseController
$user_id = $this->user_id;
if($this->status == 2){
$where['salesman_uid'] = ['eq',$user_id];
+ //获取当前业务员下级的所有老师
+ $user_ids = Db::name('my_user')->where(['pid'=>$this->pid])->column('uid');
}else{
//获取当前用户的所有下级
$user_child = Db::name('my_user')->where(['pid'=>$this->pid])->select();
@@ -418,11 +425,14 @@ class OrderSalesmanController extends WeChatBaseController
}
$this->assign('goods_count',$goods_count);
// 身份为老师，获取上级业务员的id
- $school_uid = $user_id;
- if($this->my_user['status'] == 3) {
+ $school = [];
+ if($this->my_user['status'] == 2) {
+ $user_ids[] = $user_id;
+ $school = Db::name('school')->whereIn('uid',$user_ids)->order('create_time desc')->select()->toArray();
+ } elseif($this->my_user['status'] == 3) {
$school_uid = Db::name('my_user')->where('id',$this->my_user['pid'])->value('uid');
+ $school = Db::name('school')->whereIn('uid',[$user_id,$school_uid])->order('create_time desc')->select()->toArray();
}
- $school = Db::name('school')->where('uid',$school_uid)->order('create_time desc')->select()->toArray();
if(count($school)!=0){
$schools = [];
foreach ($school as $key => $val){
--
libgit2 0.24.0