gx

@@ -187,6 +187,7 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
         }
         }
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
+        $query = $query->whereIn('gl_project_online_check.qa_status',1);
         return $query;
         return $query;
     }
     }
 
 

@@ -159,7 +159,7 @@ class UserLogic extends BaseLogic
                 //查看当前项目是否有其他的超级管理员
                 //查看当前项目是否有其他的超级管理员
                 $roleInfo = $this->model->read(['id'=>['!=',$info['id']],'role_id'=>0]);
                 $roleInfo = $this->model->read(['id'=>['!=',$info['id']],'role_id'=>0]);
                 if($roleInfo === false){
                 if($roleInfo === false){
-                    $this->fail('超级管理员不允许删除');
+                    $this->fail('唯一超级管理员，禁止删除');
                 }
                 }
             }
             }
         }
         }

@@ -171,6 +171,7 @@ class UserLoginLogic
         $info['image_max'] = $project['image_max'];
         $info['image_max'] = $project['image_max'];
         $info['is_update_language'] = $project['is_update_language'];
         $info['is_update_language'] = $project['is_update_language'];
         $info['configuration'] = $project['deploy_build']['configuration'];
         $info['configuration'] = $project['deploy_build']['configuration'];
+        $info['type'] = $project['type'];
         if($info['is_customized'] == 1){
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
             $info['is_visualization'] = json_decode($project['is_visualization']);
         }
         }