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

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Manage;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Manage\BelongingGroup;
 use App\Models\Manage\BelongingGroup;
+use App\Models\Manage\EntryPosition;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
 
 
 
 
@@ -80,4 +81,46 @@ class HrLogic extends BaseLogic
         $lists = $belongingGroupModel->list($map);
         $lists = $belongingGroupModel->list($map);
         return $this->success($lists);
         return $this->success($lists);
     }
     }
+
+    /**
+     * @remark :获取学历
+     * @name   :educationList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/22 17:49
+     */
+    public function educationList(){
+        $data = [
+            1 => '专科',
+            2 => '本科',
+            3 => '研究生及以上',
+            0 => '其他',
+        ];
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :入职岗位
+     * @name   :entryPositionList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/22 17:51
+     */
+    public function entryPositionList($map){
+        $entryPositionModel = new EntryPosition();
+        $lists = $entryPositionModel->list($map);
+        return $this->success($lists);
+    }
+
+    /**
+     * @remark :职务级别
+     * @name   :pLevel
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/22 18:10
+     */
+    public function pLevel(){
+        $lists = [];
+        return $this->success($lists);
+    }
 }
 }

+<?php
+
+namespace App\Models\Manage;
+
+use App\Models\Base;
+
+/**
+ * @remark :
+ * @class  :EntryPosition.php
+ * @author :lyh
+ * @time   :2023/7/22 18:08
+ */
+class EntryPosition extends Base
+{
+    protected $table = 'gl_manager_entry_position';
+}