新粉月销售额梯形图报表菜单权限

app/Console/Commands/DayGrandTeamTotalHistory.php

@@ -27,7 +27,7 @@ class DayGrandTeamTotalHistory extends Command {
     
     public function dayGrandTeamTotal(){
         $_start = '2019-09-04';
-        for($i=117;$i>=1;$i--){
+        for($i=140;$i>=1;$i--){
             $m = '-'.($i-1).' day';
             $n = '-'.$i.' day';
             $_end = date('Y-m-d', strtotime($m));

app/Console/Commands/RoiTeamTotalHistory.php

@@ -36,7 +36,7 @@ class RoiTeamTotalHistory extends Command {
         $salerIds = $this->getTeamSalers($team_ids);
         for($i=1;$i<7;$i++){
             $j_min = $timeArr[$i];
-            for($j=117; $j>=$j_min; $j--){
+            for($j=140; $j>=$j_min; $j--){
                 $stime = date('Y-m-d', strtotime('-'.$j.' day'));
                 $e = $j-$j_min; 
                 $etime = $date = date('Y-m-d', strtotime('-'.$e.' day'));

app/Http/Controllers/Admin/StatisticsController.php

@@ -5697,10 +5697,10 @@ class StatisticsController extends Controller
         $etime = $request->input('etime');
         $team_id = (int)$request->input('team_id',0);
 
-        $role_id = session('role_id');
+        $self_role = session('role_name');
 
         #销售和审核人员只能看自己团队的
-        if($role_id == '3' || $role_id == '4'){
+        if($self_role == '管理员' || $role_id == '销售'){
             $self_id = session('admin_id');
             $team_id = DB::table('admin')->where('id', $self_id)->pluck('team_id');
         }
@@ -5753,8 +5753,8 @@ class StatisticsController extends Controller
             }
         }
 
-        $teamList = DB::table('teams')->select('id', 'name')->where(function($query) use($role_id, $team_id){
-            if($team_id>0 && ($role_id==3 || $role_id==4)) $query->where('id', $team_id);
+        $teamList = DB::table('teams')->select('id', 'name')->where(function($query) use($self_role, $team_id){
+            if($team_id>0 && ($self_role=='管理员' || $self_role =='销售')) $query->where('id', $team_id);
         })->where('type', 1)->get();
         $teamList = json_decode(json_encode($teamList), true);