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

@@ -50,6 +50,9 @@ class SyncSubmitTask extends Command
             }
             }
             try {
             try {
                 $project = Project::getProjectByDomain($task_info['data']['domain'] ?? '');
                 $project = Project::getProjectByDomain($task_info['data']['domain'] ?? '');
+                if(!$project){
+                    throw new \Exception('项目不存在');
+                }
                 $task_info->project_id = $project->id;
                 $task_info->project_id = $project->id;
                 SyncSubmitTaskService::handler($task_info);
                 SyncSubmitTaskService::handler($task_info);
                 $task_info->status = 1;
                 $task_info->status = 1;

@@ -211,8 +211,10 @@ class ExtensionModuleController extends BaseController
                             $status_data[$value] = $number;
                             $status_data[$value] = $number;
                             $number++;
                             $number++;
                         }
                         }
-                        if(($status_data[$info['value']] + 1) != $status_data[$v['value']]){
-                            $this->fail('流程控制不能跳流程选择');
+                        if(($status_data[$info['value']]) != $status_data[$v['value']]){
+                            if(($status_data[$info['value']] + 1) != $status_data[$v['value']]){
+                                $this->fail('流程控制不能跳流程选择');
+                            }
                         }
                         }
                         if($status_data[$info['value']] > $status_data[$v['value']]){
                         if($status_data[$info['value']] > $status_data[$v['value']]){
                             $this->fail('流程控制不能回滚');
                             $this->fail('流程控制不能回滚');

@@ -10,6 +10,7 @@ use App\Models\Optimize\Process;
 use App\Services\Facades\Upload;
 use App\Services\Facades\Upload;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
+use Illuminate\Support\Str;
 
 
 class Project extends Base
 class Project extends Base
 {
 {
@@ -389,6 +390,9 @@ class Project extends Base
                             }
                             }
                         }
                         }
                     }
                     }
+                    if(!Str::startsWith($domain, 'www')){
+                        $domain = 'www.' . $domain;
+                    }
                     $project_id = $domainModel->formatQuery(['domain'=>$domain,'status'=>1])->value('project_id');
                     $project_id = $domainModel->formatQuery(['domain'=>$domain,'status'=>1])->value('project_id');
                 }
                 }
             }
             }