gx

@@ -44,7 +44,7 @@ class HrController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
-        $info = $logic->getHrInfo($this->param['id']);
+        $info = $logic->getHrInfo();
         $info['photo_gallery_link'] = $info['photo_gallery'];
         $info['photo_gallery_link'] = $info['photo_gallery'];
         $info['id_card_gallery_link'] = $info['id_card_gallery'];
         $info['id_card_gallery_link'] = $info['id_card_gallery'];
         $info['certificate_gallery_link'] = $info['certificate_gallery'];
         $info['certificate_gallery_link'] = $info['certificate_gallery'];

@@ -38,7 +38,7 @@ class LoginLogic extends BaseLogic
      */
      */
     public function login()
     public function login()
     {
     {
-        $manage = $this->model->select('id', 'name', 'password', 'token', 'status', 'gid', 'dept_id','role')
+        $manage = $this->model->select('id', 'name', 'password', 'token', 'status', 'gid', 'dept_id','manager_id','role')
             ->where('mobile', $this->param['mobile'])->first();
             ->where('mobile', $this->param['mobile'])->first();
         if (!$manage){
         if (!$manage){
             $this->fail('登录用户名不存在');
             $this->fail('登录用户名不存在');

@@ -60,16 +60,16 @@ class HrLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/7/25 9:27
      * @time   :2023/7/25 9:27
      */
      */
-    public function getHrInfo($id){
+    public function getHrInfo(){
         //查看当前用户是否有人事权限
         //查看当前用户是否有人事权限
-        if($this->manager['gid'] != ManageHr::GID_ZERO){
+        if(isset($this->param['id']) && ($this->manager['gid'] != ManageHr::GID_ZERO)){
             $groupModel = new Group();
             $groupModel = new Group();
             $groupInfo = $groupModel->read(['id'=>$this->manager['gid']]);
             $groupInfo = $groupModel->read(['id'=>$this->manager['gid']]);
-            if (!in_array(20,$groupInfo['rights']) && ($id != $this->manager['id'])) {
+            if (!in_array(20,$groupInfo['rights']) && ($this->param['id'] != $this->manager['id'])) {
                 $this->fail('无权限查看其他用户信息');
                 $this->fail('无权限查看其他用户信息');
             }
             }
         }
         }
-        $data = $this->model->read(['id'=>$id]);
+        $data = $this->model->read($this->param);
         foreach ($this->model::specieField() as $v){
         foreach ($this->model::specieField() as $v){
             $data[$v] = json_decode($data[$v],true);
             $data[$v] = json_decode($data[$v],true);
         }
         }