Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -11,6 +11,7 @@ namespace App\Http\Logic\Aside\Manage;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
+use App\Models\Manage\ManageHr;
 use App\Models\Manage\MenuSpecial;
 use App\Models\Manage\MenuSpecial;
 
 
 class MenuSpecialLogic extends BaseLogic
 class MenuSpecialLogic extends BaseLogic
@@ -31,11 +32,37 @@ class MenuSpecialLogic extends BaseLogic
      */
      */
     public function managerList($map){
     public function managerList($map){
         $managerModel = new Manage();
         $managerModel = new Manage();
-        $list = $managerModel->list($map,'id',['id','name']);
-        return $this->success($list);
+        $query = $managerModel->leftJoin('gl_manage_hr', 'gl_manage.id', '=', 'gl_manage_hr.manage_id');
+        $query = $this->searchParam($query,$map);
+        $lists = $query->select($this->selectParam())->get()->toArray();
+        return $this->success($lists);
     }
     }
 
 
     /**
     /**
+     * @remark :搜索
+     * @name   :searchParam
+     * @author :lyh
+     * @method :post
+     * @time   :2024/10/24 11:50
+     */
+    public function searchParam(&$query,$map){
+         $query = $query->where('gl_manage_hr.status', $map['status'] ?? 1);
+         return $query;
+    }
+
+    /**
+     * 需要查询的字段
+     * @return array
+     */
+    public function selectParam(){
+        $select = [
+            'gl_manage.id AS id',
+            'gl_manage.name AS name',
+            'gl_manage_hr.status as status'
+        ];
+        return $select;
+    }
+    /**
      * @remark :获取详情
      * @remark :获取详情
      * @name   :specialInfo
      * @name   :specialInfo
      * @author :lyh
      * @author :lyh