gx

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Aside\Manage;
 namespace App\Http\Controllers\Aside\Manage;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Models\Manage\ManageHr;
+use App\Models\Manage\Menu;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use App\Http\Logic\Aside\Manage\HrLogic;
 use App\Http\Logic\Aside\Manage\HrLogic;
 
 
@@ -36,8 +38,16 @@ class HrController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/9/6 10:04
      * @time   :2023/9/6 10:04
      */
      */
-    public function info(Request $request, HrLogic $logic){
-        $request->validate([
+    public function info(HrLogic $logic){
+        //查看当前用户是否有人事权限
+        if($this->manage['gid'] != ManageHr::GID_ZERO){
+            $menuModel = new Menu();
+            $menuInfo = $menuModel->read(['gid'=>$this->manage['gid']]);
+            if (strpos(','.$menuInfo['rights'].',', ',20,') === false) {
+                $this->param['id'] = $this->manage['id'];
+            }
+        }
+        $this->request->validate([
             'id'=>'required'
             'id'=>'required'
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'

@@ -29,41 +29,46 @@ class LoginLogic extends BaseLogic
         $this->model = new Manage();
         $this->model = new Manage();
     }
     }
 
 
-
+    /**
+     * @remark :登录
+     * @name   :login
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/8 17:05
+     */
     public function login()
     public function login()
     {
     {
-        $manage = $this->model->select('id', 'name', 'password', 'token', 'status', 'gid', 'dept_id','role')
-            ->where('mobile', $this->param['mobile'])->first();
-        if (!$manage){
+        $info = $this->model->read(['mobile'=>$this->param['mobile']],['id', 'name', 'password', 'token', 'status', 'gid', 'dept_id','role']);
+        if($info === false){
             $this->fail('登录用户名不存在');
             $this->fail('登录用户名不存在');
         }
         }
-        if (Manage::STATUS_DISABLE == $manage->status) {
+        if (Manage::STATUS_DISABLE == $info['status']) {
             $this->fail('帐号已被禁用');
             $this->fail('帐号已被禁用');
         }
         }
+        //查看当前账号下有几个项目
+        if($this->param['password'] == '123456' && $this->param['mobile'] != '15680871314'){
+            $this->fail('请使用短信登录，修改初始密码');
+        }
         $type = 1;//账号密码登录
         $type = 1;//账号密码登录
-        if (!Hash::check($this->param['password'], $manage->password)) {
+        if (!Hash::check($this->param['password'], $info['password'])) {
             //验证验证码
             //验证验证码
             $this->verifyCode($this->param['mobile'],$this->param['password']);
             $this->verifyCode($this->param['mobile'],$this->param['password']);
             $type = 2;//验证码登录
             $type = 2;//验证码登录
         }
         }
-        if(!empty($manage['token'])){
+        if(!empty($info['token'])){
             //清除上一次用户缓存
             //清除上一次用户缓存
-            Cache::pull(Common::MANAGE_TOKEN . $manage['token']);
+            Cache::pull(Common::MANAGE_TOKEN . $info['token']);
         }
         }
         //生成新token
         //生成新token
-        $token = md5(uniqid().$manage['id']);
+        $token = md5(uniqid().$info['id']);
         //存储缓存
         //存储缓存
-        $manage['token'] = $token;
-        Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6);
+        $info['token'] = $token;
+        Cache::add(Common::MANAGE_TOKEN . $token,$info,3600 * 6);
         //更新用户信息
         //更新用户信息
-        $manage->token = $token;
-        $res = $manage->save();
-        if(!$res){
-            $this->fail('系统错误，请联系管理员');
-        }
-        LoginLog::addLog($manage->id,$type);
+        $this->model->edit(['token'=>$token],['id'=>$info['id']]);
+        LoginLog::addLog($info['id'],$type);
         //获取当前用户特殊模块权限
         //获取当前用户特殊模块权限
-        $manage['special'] = $this->getSpecialMenu($manage['id']);
+        $manage['special'] = $this->getSpecialMenu($info['id']);
         return $this->success($manage->makeVisible('token')->toArray());
         return $this->success($manage->makeVisible('token')->toArray());
     }
     }
 
 

@@ -43,6 +43,9 @@ class UserLoginLogic
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
         }
         }
         //查看当前账号下有几个项目
         //查看当前账号下有几个项目
+        if($this->param['password'] == '123456' && $this->param['mobile'] != '15680871314'){
+            $this->fail('请使用短信登录，修改初始密码');
+        }
         $password = base64_encode(md5($this->param['password']));
         $password = base64_encode(md5($this->param['password']));
         $list = $this->model->list(['mobile'=>$this->param['mobile'],
         $list = $this->model->list(['mobile'=>$this->param['mobile'],
             'password'=>$password,'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
             'password'=>$password,'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);

@@ -7,6 +7,8 @@ class ManageHr extends Base
 {
 {
     protected $table = 'gl_manage_hr';
     protected $table = 'gl_manage_hr';
 
 
+    const GID_ZERO = 0;//超级管理员
+
     const STATUS_ONE = 1;
     const STATUS_ONE = 1;
     /**
     /**
      * 特殊字段
      * 特殊字段

@@ -25,7 +25,7 @@ return [
     //默认视频
     //默认视频
     'default_file'  =>[
     'default_file'  =>[
         'size' => [
         'size' => [
-            'max'   =>  1024*1024*20,    // 2M
+            'max'   =>  1024*1024*20,    // 20M
         ],
         ],
         'path_b'  =>  '/upload/p',
         'path_b'  =>  '/upload/p',
         'path_a'  =>  '/upload/m',
         'path_a'  =>  '/upload/m',