筛选条件优化

app/controller/CompanyItem.php

@@ -16,27 +16,28 @@ class CompanyItem extends BaseController
     public function getList()
     {
 
-        $post = $this->request->only(['pid' => '', 'name' => '', 'nickname' => '', 'companyNo' => ''], 'post', 'trim');
+        $post = $this->request->only(['pid' => '', 'name' => '', 'nickname' => '', 'companyNo' => '', 'companyName' => ''], 'post', 'trim');
 
-        $condition = [['is_del', '=', 0]];
-        $depart = [['a.is_del', '=', 0]];
+        $condition = $depart = [['a.is_del', '=', 0]];
 
-        if ($post['pid'] !== '') $condition[] = ["pid", "=", $post['pid']];
-        if ($post['name'] != "") $condition[] = ["name", "like", "%{$post['name']}%"];
-        if ($post['pid'] === '' && $post['name'] == '' && $post['nickname'] == '') $condition[] = ["pid", "=", 0];
+        if ($post['pid'] !== '') $condition[] = ["a.pid", "=", $post['pid']];
+        if ($post['name'] != "") $condition[] = ["a.name", "like", "%{$post['name']}%"];
+        if ($post['pid'] === '' && $post['name'] == '' && $post['nickname'] == '') $condition[] = ["a.pid", "=", 0];
         if ($post['nickname'] != '') {
             $is = Db::name("account")
                 ->alias('a')
-                ->leftJoin('account_company b', 'b.account_id=a.id')
+                ->leftJoin('account_item b', 'b.account_id=a.id')
                 ->leftJoin('user c', 'c.account_id=a.id')
                 ->where('a.is_del', 0)
                 ->whereLike('c.nickname', '%' . $post['nickname'] . '%')
                 ->column('b.itemid');
             if (empty($is)) return json_show(1004, "未找到数据");
-            $condition[] = ["id", "in", $is];
+            $condition[] = ["a.id", "in", $is];
         }
+        if ($post['companyNo'] != '') $condition[] = ['a.companyNo', 'like', '%' . $post['companyNo'] . '%'];
 
         $pidlist = Db::name("company_item")
+            ->alias('a')
             ->where($condition)
             ->column("pid");
         if (!empty($pidlist)) $depart[] = [["b.itemid", "in", $pidlist]];
@@ -48,13 +49,18 @@ class CompanyItem extends BaseController
         $item = Db::name("account")
             ->alias('a')
             ->field('a.id account_id,c.nickname,b.itemid,a.is_del,a.status,b.position')
-            ->leftJoin('account_company b', 'b.account_id=a.id')
+            ->leftJoin('account_item b', 'b.account_id=a.id')
             ->leftJoin('user c', 'c.account_id=a.id')
             ->where($depart)
             ->select()
             ->toArray();
 
+        if ($post['companyName'] != '') $condition[] = ['b.name', 'like', '%' . $post['companyName'] . '%'];
+
         $list = Db::name("company_item")
+            ->alias('a')
+            ->field('a.*,b.name companyName')
+            ->leftJoin('headquarters b', 'b.code=a.companyNo')
             ->where($condition)
             ->select()
             ->toArray();
@@ -77,7 +83,7 @@ class CompanyItem extends BaseController
         $val = Validate::rule([
             'companyNo|所属企业' => 'require|max:255',
             'name|部门名称' => 'require|max:255',
-            'pid|父级id' => 'require|number|gt:0',
+            'pid|父级id' => 'require|number|egt:0',
             'level|部门层级' => 'number|gt:0',
             'weight|排序权重' => 'number|gt:0',
         ]);
@@ -148,7 +154,7 @@ class CompanyItem extends BaseController
             'id' => 'require|number|gt:0',
             'companyNo|所属企业' => 'require|max:255',
             'name|部门名称' => 'require|max:255',
-            'pid|父级id' => 'require|number|gt:0',
+            'pid|父级id' => 'require|number|egt:0',
             'level|部门层级' => 'number|gt:0',
             'weight|排序权重' => 'number|gt:0',
         ]);
@@ -355,7 +361,7 @@ class CompanyItem extends BaseController
         //获取所有部门id对应的部门名称
         foreach ($itemids as $itemid) {
             if (!isset($item_tmp[$itemid])) {
-                if ($param['get_tops']==1) $tmp = get_part($itemid);
+                if ($param['get_tops'] == 1) $tmp = get_part($itemid);
                 else $tmp = Db::name('company_item')
                     ->field('id,name,pid')
                     ->where(['is_del' => 0, 'id' => $itemid])
@@ -368,7 +374,7 @@ class CompanyItem extends BaseController
 
         if (is_numeric($param['uid'])) $param['uid'] = [$param['uid']];
         foreach ($param['uid'] as $uid) {
-            if(!isset($res[$uid])) $res[$uid] = $item_tmp[$itemids[$uid]] ?? '';
+            if (!isset($res[$uid])) $res[$uid] = $item_tmp[$itemids[$uid]] ?? '';
         }
 
         return json_show(0, '获取成功', $res);

app/controller/UserCompanyBasic.php

@@ -16,14 +16,23 @@ class UserCompanyBasic extends BaseController
     //列表
     public function getList()
     {
-        $post = $this->request->only(['nickname' => '', 'username' => '', 'status' => '', 'page' => 1, 'size' => 10, 'islevel' => 1], 'post');
+        $post = $this->request->only(['nickname' => '', 'username' => '', 'status' => '', 'page' => 1, 'size' => 10, 'islevel' => 1,'level'=>'2','companyNo'=>''], 'post');
         $condition = [['a.is_del', '=', 0]];
 
         if ($post['nickname'] != '') $condition[] = ['nickname', 'like', "%{$post['nickname']}%"];
         if ($post['username'] != '') $condition[] = ['username', 'like', "%{$post['username']}%"];
         if ($post['status'] != '') $condition[] = ['a.status', '=', $post['status']];
-        if ($post['islevel'] == 1) $condition[] = ['a.level', '=', 1];
-        else $condition[] = ['a.level', '<>', 1];
+        if ($post['level'] != '') $condition[] = ['a.level', '=', $post['level']];
+//        if ($post['islevel'] == 1) $condition[] = ['a.level', '=', 1];
+//        else $condition[] = ['a.level', '<>', 1];
+        if ($post['companyNo'] !== '') {
+            //根据公司筛选账号
+            $rs = Db::name('account_company')
+                ->where(['is_del' => 0, 'status' => 1])
+                ->whereLike('companyCode', '%' . $post['companyNo'] . '%')
+                ->column('account_id');
+            $condition[] = ['a.id', 'in', $rs];
+        }
 
         $count = Db::name('account')
             ->alias('a')