gx

@@ -36,7 +36,7 @@ class Count extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $list = DB::table('gl_project')
+        $list = DB::table('gl_project')->where('gl_project.extend_type','!=',5)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get()->toArray();
             ->select($this->selectParam())->get()->toArray();
@@ -151,6 +151,7 @@ class Count extends Command
     public function selectParam(){
     public function selectParam(){
         $select = [
         $select = [
             'gl_project.id AS user_id',
             'gl_project.id AS user_id',
+            'gl_project.extend_type AS extend_type',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_build.project_id AS project_id',
             'gl_project_deploy_build.project_id AS project_id',

@@ -34,7 +34,7 @@ class InquiryMonthlyCount extends Command
      * @time   :2023/6/30 9:32
      * @time   :2023/6/30 9:32
      */
      */
     public function handle(){
     public function handle(){
-        $list = DB::table('gl_project')
+        $list = DB::table('gl_project')->where('gl_project.extend_type','!=',5)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get()->toArray();
             ->select($this->selectParam())->get()->toArray();
@@ -167,6 +167,7 @@ class InquiryMonthlyCount extends Command
     public function selectParam(){
     public function selectParam(){
         $select = [
         $select = [
             'gl_project.id AS user_id',
             'gl_project.id AS user_id',
+            'gl_project.extend_type AS extend_type',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_build.project_id AS project_id',
             'gl_project_deploy_build.project_id AS project_id',

@@ -28,6 +28,10 @@ class ImageController extends Controller
 
 
     public $cache = '';//缓存数据
     public $cache = '';//缓存数据
 
 
+    public $map;
+
+    public $param;
+
     public $upload_location = 0;//是否同步到cos
     public $upload_location = 0;//是否同步到cos
     //上传图片类型
     //上传图片类型
     public $image_type = [
     public $image_type = [
@@ -45,9 +49,42 @@ class ImageController extends Controller
         $this->param = $this->request->all();
         $this->param = $this->request->all();
         $this->config = config('filesystems.disks.upload');
         $this->config = config('filesystems.disks.upload');
         $this->uploads = config('upload.default_image');
         $this->uploads = config('upload.default_image');
+        $this->get_param();
     }
     }
 
 
     /**
     /**
+     * @remark :参数过滤
+     * @name   :get_param
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/14 14:27
+     */
+    public function get_param(){
+        $param = $this->param;
+        foreach ($param as $k => $v){
+            if(is_array($v)){
+                continue;
+            }
+            switch ($k){
+                case "order":
+                    $this->order = $v;
+                    break;
+                case 'page':
+                    $this->page = $v;
+                    break;
+                case 'row':
+                    $this->row = $v;
+                    break;
+                case "status":
+                    $this->map['status'] = $v;
+                    break;
+                default:
+                    $this->map[$k] = $v;
+                    break;
+            }
+        }
+    }
+    /**
      * @name   :index
      * @name   :index
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
@@ -300,7 +337,7 @@ class ImageController extends Controller
      */
      */
     public function getImageList(){
     public function getImageList(){
         $imageModel = new ImageModel();
         $imageModel = new ImageModel();
-        $lists = $imageModel->list($this->param,$order = 'id');
+        $lists = $imageModel->lists($this->map,$this->page,$this->row,$order = 'id');
         foreach ($lists as $k => $v){
         foreach ($lists as $k => $v){
             $v['image_link'] = getImageUrl($v['hash']);
             $v['image_link'] = getImageUrl($v['hash']);
             $lists[$k] = $v;
             $lists[$k] = $v;