提交 736bffc0 authored 作者: 窦斌's avatar 窦斌

edit

上级 aa77fbbe
...@@ -543,6 +543,7 @@ class ServiceProviderController extends BaseController ...@@ -543,6 +543,7 @@ class ServiceProviderController extends BaseController
// $adminData = $request->only(array_keys($this->validateRules['rules'])); // $adminData = $request->only(array_keys($this->validateRules['rules']));
$adminData = $this->_setAdminData($adminData, $request); $adminData = $this->_setAdminData($adminData, $request);
$adminData['company_id'] = $session['company_id']; $adminData['company_id'] = $session['company_id'];
$adminData['company_type'] = $session['com_type'];
if ($adminData['admin_groupnew'] == 3) {//经销商新增一个公司 if ($adminData['admin_groupnew'] == 3) {//经销商新增一个公司
$adminData['admin_groupnew'] = 3; $adminData['admin_groupnew'] = 3;
......
...@@ -231,8 +231,16 @@ class LoginController extends BaseController ...@@ -231,8 +231,16 @@ class LoginController extends BaseController
* |---------------------------------------------------------------------- * |----------------------------------------------------------------------
*/ */
public function getGroupData ( $parameter , $result , $ip ){ public function getGroupData ( $parameter , $result , $ip ){
$com_parent_id = Company::where("com_id",$result['company_id'])->value('com_parent_id'); $company = Company::where("com_id",$result['company_id'])->first();
$com_parent_id = $company['com_parent_id'];
// $com_parent_id = Company::where("com_id",$result['company_id'])->value('com_parent_id');
$result['com_parent_id'] = $com_parent_id.",".$result['company_id']; $result['com_parent_id'] = $com_parent_id.",".$result['company_id'];
$result['com_type'] = $company['com_type'];
if($company['com_type']==2){
$company['search_id'] = Admin::where('company_id',$result['company_id'])->where("admin_groupnew",3)->value('id');
}else{
$company['search_id']=$result['id'];
}
$function = Functions::where('function_type',3)->select('function_id','function_model','function_action')->get()->toArray(); $function = Functions::where('function_type',3)->select('function_id','function_model','function_action')->get()->toArray();
$list = []; $list = [];
foreach ($function as $k =>$v){ foreach ($function as $k =>$v){
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use App\Models\Company;
use Closure; use Closure;
use DB; use DB;
use App\Models\AdminToken; use App\Models\AdminToken;
......
...@@ -570,7 +570,7 @@ class OrderListService extends Service ...@@ -570,7 +570,7 @@ class OrderListService extends Service
if (!in_array($session['admin_groupnew'], [2,3,7])){//管理员可以看全部 if (!in_array($session['admin_groupnew'], [2,3,7])){//管理员可以看全部
$where['gone_order_list.company_id'] = $session['company_id']; $where['gone_order_list.company_id'] = $session['company_id'];
} }
if ($session['admin_groupnew'] == 3) { if ($session['com_type'] == 2) {
$where['gone_order_list.agency_id'] = $session['company_id']; $where['gone_order_list.agency_id'] = $session['company_id'];
} }
...@@ -613,7 +613,7 @@ class OrderListService extends Service ...@@ -613,7 +613,7 @@ class OrderListService extends Service
$data['button_search'] = $export['button_search']??[];//搜索栏按钮 $data['button_search'] = $export['button_search']??[];//搜索栏按钮
$list = CommonService::dataToArray($paginate->items()); $list = CommonService::dataToArray($paginate->items());
if($list){ if($list){
$list = self::getButtonDatas($all_button, $list); $list = self::getButtonDatas($all_button, $list, $session);
$data['list'] = $list; $data['list'] = $list;
$data['page'] = [ $data['page'] = [
'count' => $paginate->total(), 'count' => $paginate->total(),
...@@ -655,7 +655,7 @@ class OrderListService extends Service ...@@ -655,7 +655,7 @@ class OrderListService extends Service
* @return string * @return string
* @author du 2021年8月18日下午3:40:48 * @author du 2021年8月18日下午3:40:48
*/ */
public static function getButtonDatas($all_button,$list){ public static function getButtonDatas($all_button,$list,$session){
$time = date("Y-m-d",strtotime("+1 day")); $time = date("Y-m-d",strtotime("+1 day"));
$pts = PlatformService::getAll(true,'id'); $pts = PlatformService::getAll(true,'id');
$orderStau = OrderService::getOrderStatusName();//获取订单状态名 $orderStau = OrderService::getOrderStatusName();//获取订单状态名
...@@ -694,6 +694,9 @@ class OrderListService extends Service ...@@ -694,6 +694,9 @@ class OrderListService extends Service
} }
$button[] = 'addNote,sendSmsOrderListModel'; $button[] = 'addNote,sendSmsOrderListModel';
if($session['admin_groupnew']==3 && $v['ser_id']!=$session['search_id']){
$button[] = [];
}
$button = BmmcService::getListButton($button,$all_button); $button = BmmcService::getListButton($button,$all_button);
$list[$k]['button_one'] = $button['button_one']??[]; $list[$k]['button_one'] = $button['button_one']??[];
$list[$k]['button_two'] = $button['button_two']??[]; $list[$k]['button_two'] = $button['button_two']??[];
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论