Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/controller/Company.php

@@ -27,6 +27,14 @@ class Company extends BaseController
         return CompanyLogic::list($param);
     }
 
+    //获取全部企业
+    public function all()
+    {
+        $keyword = $this->request->post('keyword', '');
+
+        return CompanyLogic::all($keyword);
+    }
+
     //添加企业
     public function add()
     {

app/admin/logic/CompanyLogic.php

@@ -23,13 +23,28 @@ class CompanyLogic extends BaseLogic
         $list = $db
             ->field('id,title,contacts,mobile,remark,status,addtime')
             ->page($data['page'], $data['size'])
-            ->order(['addtime'=>'desc','id'=>'desc'])
+            ->order(['addtime' => 'desc', 'id' => 'desc'])
             ->select()
             ->toArray();
 
         return json_show(CommonModel::$success, '获取成功', ['list' => $list, 'count' => $count]);
     }
 
+    //获取企业列表
+    public static function all(string $keyword = ''): Json
+    {
+        $db = CompanyModel::where('is_del', CommonModel::$del_normal);
+        if ($keyword != '') $db->whereLike('title', '%' . $keyword . '%');
+
+        $list = $db
+            ->field('id,title,status')
+            ->order(['addtime' => 'desc', 'id' => 'desc'])
+            ->select()
+            ->toArray();
+
+        return json_show(CommonModel::$success, '获取成功', $list);
+    }
+
     //添加企业
     public static function add(array $data = []): Json
     {

app/admin/route/app.php

@@ -64,6 +64,7 @@ Route::rule('cardDelete', 'admin/Card/delete');//删除卡类型
 
 //【企业】
 Route::rule('companyList', 'admin/Company/list');//获取企业列表
+Route::rule('companyAll', 'admin/Company/all');//获取全部企业
 Route::rule('companyAdd', 'admin/Company/add');//添加企业
 Route::rule('companyRead', 'admin/Company/read');//获取企业详情
 Route::rule('companyEdit', 'admin/Company/edit');//编辑企业