浏览代码

修改获取企业列表-搜索框状态问题

15313670163 3 天之前
父节点
当前提交
6c92d56d45
共有 1 个文件被更改,包括 13 次插入7 次删除
  1. 13 7
      app/JsonRpc/NewsService.php

+ 13 - 7
app/JsonRpc/NewsService.php

@@ -5801,6 +5801,7 @@ class NewsService implements NewsServiceInterface
      */
     public function getCompanyList(array $data): array
     {
+      // return Result::success($data);
         $where = [];
         $user = User::where('id', $data['user_id'])->first();
         if(empty($user)){
@@ -5809,18 +5810,23 @@ class NewsService implements NewsServiceInterface
         if($user['type_id']!= 10000){
             $where['user_id'] = $data['user_id'];
         }
-        if(isset($data['title']) && $data['title']){
+        if(isset($data['title']) && !empty($data['title'])){
             array_push($where, ['company.title', 'like', '%'. $data['title']. '%']);
         }
-        if(isset($data['website_id']) && $data['website_id']){
-            $where['company.website_id'] = $data['website_id'];
+        if(isset($data['website_name']) && !empty($data['website_name'])){
+          array_push($where, ['website.website_name', 'like', '%'. $data['website_name']. '%']);
         }
         if(isset($data['ischeck']) && !empty($data['ischeck'])){
-            if($data['ischeck'] == 1){
+          if($data['ischeck'] == 1){
+              if(isset($data['status']) && $data['status'] != ''){
+                array_push($where, ['company.status', $data['status']]);
+                $query = Company::where($where);
+              }else{
                 $query =  Company::whereIn('company.status', [0,2]);
-            }else{
-                $query =  Company::where('company.status', 1);
-            }
+              }
+          }else{
+              $query =  Company::where('company.status', 1);
+          }
         }
         $result = $query->where($where)
         ->leftJoin('website_category', function ($query) {