合并分支 'zgj' 到 'master'

修复售后技术排序

修复售后技术排序

查看合并请求 !168

@@ -544,17 +544,17 @@ class ProjectController extends BaseController
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
         }
         }
         $lists = $hrManagerModel->list($this->map,'id',['id','manage_id','name','entry_position','is_leader']);
         $lists = $hrManagerModel->list($this->map,'id',['id','manage_id','name','entry_position','is_leader']);
-        
+
         //zgj 售后技术排序调整 start
         //zgj 售后技术排序调整 start
-        if(isset($this->map['entry_position'][1]) && in_array(45,$this->map['entry_position'][1])){
-            $ar_sort = ['王娇'=>1,'银蝶'=>2,'胡哲'=>3,'郭婷婷'=>4,'徐庆'=>5,'邓锦康'=>6,'兰波'=>7];
-            foreach ($lists as $k=>$v){
-                $lists[$k]['sort'] = 0;
-                if(in_array($v['name'],array_keys($ar_sort))){
-                    $lists[$k]['sort'] = $ar_sort[$v['name']];
-                }
+        $ar_sort = ['王娇'=>1,'银蝶'=>2,'胡哲'=>3,'郭婷婷'=>4,'徐庆'=>5,'邓锦康'=>6,'兰波'=>7];
+        foreach ($lists as $k=>$v){
+            $lists[$k]['sort'] = 0;
+            if(in_array($v['name'],array_keys($ar_sort))){
+                $lists[$k]['sort'] = $ar_sort[$v['name']];
             }
             }
-            $sort_arr = array_column($lists, 'sort');
+        }
+        $sort_arr = array_column($lists, 'sort');
+        if($sort_arr){
             array_multisort($sort_arr,SORT_DESC,$lists);
             array_multisort($sort_arr,SORT_DESC,$lists);
         }
         }
         //售后技术排序调整 end
         //售后技术排序调整 end