Merge remote-tracking branch 'origin/master' into akun

@@ -92,4 +92,20 @@ class HrController extends BaseController
         return $this->response('success',Code::SUCCESS, $result);
         return $this->response('success',Code::SUCCESS, $result);
     }
     }
 
 
+    /**
+     * @remark :修改排序
+     * @name   :sort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/7 9:12
+     */
+    public function sort(HrLogic $hrLogic){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $hrLogic->setSort();
+        return $this->response('success');
+    }
 }
 }

@@ -144,7 +144,7 @@ class OnlineController extends BaseController
         }
         }
         if(isset($this->map['all_status'])){
         if(isset($this->map['all_status'])){
             // 搜索状态
             // 搜索状态
-            $query->where('gl_project_online_check.qa_status',$this->map['qa_status']);
+            $query->where('gl_project_online_check.qa_status',$this->map['all_status']);
         }
         }
         if(isset($this->map['optimist_status'])){
         if(isset($this->map['optimist_status'])){
             // 搜索状态
             // 搜索状态

@@ -540,24 +540,10 @@ class ProjectController extends BaseController
     public function getManagerList(){
     public function getManagerList(){
         $hrManagerModel = new ManageHr();
         $hrManagerModel = new ManageHr();
         $this->map['status'] = $hrManagerModel::STATUS_ONE;
         $this->map['status'] = $hrManagerModel::STATUS_ONE;
-        if(isset($this->map['entry_position']) && is_array($this->map['entry_position'])){
+        if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
             $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
-        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']];
-                }
-            }
-            $sort_arr = array_column($lists, 'sort');
-            array_multisort($sort_arr,SORT_DESC,$lists);
-        }
-        //售后技术排序调整 end
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -311,4 +311,16 @@ class HrLogic extends BaseLogic
         $list = $this->model->with('dept')->with('position')->select(['name', 'id_card', 'mobile', 'dept_id', 'entry_position', 'status'])->orderBy('id', 'desc')->paginate($page_size);
         $list = $this->model->with('dept')->with('position')->select(['name', 'id_card', 'mobile', 'dept_id', 'entry_position', 'status'])->orderBy('id', 'desc')->paginate($page_size);
         return $list;
         return $list;
     }
     }
+
+    /**
+     * @remark :设置排序
+     * @name   :setSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/7 9:13
+     */
+    public function setSort(){
+        $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        return $this->success();
+    }
 }
 }

@@ -134,6 +134,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::get('/', [Aside\Manage\HrController::class, 'list'])->name('admin.hr');
             Route::get('/', [Aside\Manage\HrController::class, 'list'])->name('admin.hr');
             Route::get('/info', [Aside\Manage\HrController::class, 'info'])->name('admin.hr_info');
             Route::get('/info', [Aside\Manage\HrController::class, 'info'])->name('admin.hr_info');
             Route::post('/save', [Aside\Manage\HrController::class, 'save'])->name('admin.hr_save');
             Route::post('/save', [Aside\Manage\HrController::class, 'save'])->name('admin.hr_save');
+            Route::post('/sort', [Aside\Manage\HrController::class, 'sort'])->name('admin.hr_sort');
             Route::get('/getSearchParamsList', [Aside\Manage\HrController::class, 'getSearchParamsList'])->name('admin.hr_getSearchParamsList');
             Route::get('/getSearchParamsList', [Aside\Manage\HrController::class, 'getSearchParamsList'])->name('admin.hr_getSearchParamsList');
         });
         });