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

@@ -63,7 +63,7 @@ class NavLogic extends  BaseLogic
                 }
                 }
             }
             }
         }
         }
-
+        $data['url'] = $data['url'] ?: '';
         // 保存
         // 保存
         $id = parent::save($data);
         $id = parent::save($data);
 
 

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside\User;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Helper\Common;
 use App\Helper\Common;
+use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\SmsLog;
 use App\Models\SmsLog;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
@@ -148,6 +149,11 @@ class UserLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
+        $project = (new ProjectLogic())->getInfo($info['id']);
+        $info['company'] = $project['company'] ?? '';
+        $info['plan'] = $project['deploy_build']['plan'][0] ?? '';
+        $info['domain'] = !empty($project['deploy_optimize']['domain']) ? $project['deploy_optimize']['domain'] : ($project['deploy_build']['test_domain'] ?? '');
+
         //写入日志
         //写入日志
         Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip()]);
         Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip()]);
         return $this->success($info);
         return $this->success($info);

@@ -71,7 +71,7 @@ class RouteMap extends Model
      * @date 2023/4/17
      * @date 2023/4/17
      */
      */
     protected static function isExist($route, $source, $source_id, $project_id){
     protected static function isExist($route, $source, $source_id, $project_id){
-        $fixed = []; //固定的路由
+        $fixed = ['news','products','search','blog']; //固定的路由
         if(in_array($route, $fixed)){
         if(in_array($route, $fixed)){
             return true;
             return true;
         }
         }