ad

app/controller/UserInfo.php

@@ -267,43 +267,58 @@ class UserInfo extends BaseController
 
     public function UserListByCompany()
     {
-        $post=$this->request->only(["nickname"=>"","username"=>"","status"=>"","uid"=>[],"nuid"=>[],"companyNo"=>"","page"=>1, "size"=>10],"post");
-        $condition = [["a.is_del","=",0]];
-        $whereor=[];
-        isset($post['nickname'])&& $post['nickname']!="" ? $condition[]=["nickname","like","%{$post['nickname']}%"] : "";
-        isset($post['username'])&& $post['username']!="" ? $condition[]=["username","like","%{$post['username']}%"] : "";
-        isset($post['status'])&& $post['status']!=="" ? $condition[]=["a.status","=",$post['status']] : "";
-        isset($post['uid'])&& $post['uid']!==""&&!empty($post['uid']) ? $condition[]=["a.id","in",$post['uid']] : "";
-        isset($post['nuid'])&& $post['nuid']!==""&&!empty($post['nuid']) ? $condition[]=["a.id","not in",$post['nuid']] : "";
-        isset($post['companyNo'])&& $post['companyNo']!=="" ? $condition[]=["c.companyCode","=",$post['companyNo']]
-        :$whereor[]=["c.companyCode","=",null];
+        $post = $this->request->only(["nickname" => "", "username" => "", "status" => "", "uid" => [], "nuid" => [], "companyNo" => "", "page" => 1, "size" => 10], "post");
+        $condition = [["a.is_del", "=", 0]];
+        $whereor = [];
+        isset($post['nickname']) && $post['nickname'] != "" ? $condition[] = ["nickname", "like", "%{$post['nickname']}%"] : "";
+        isset($post['username']) && $post['username'] != "" ? $condition[] = ["username", "like", "%{$post['username']}%"] : "";
+        isset($post['status']) && $post['status'] !== "" ? $condition[] = ["a.status", "=", $post['status']] : "";
+        isset($post['uid']) && $post['uid'] !== "" && !empty($post['uid']) ? $condition[] = ["a.id", "in", $post['uid']] : "";
+        isset($post['nuid']) && $post['nuid'] !== "" && !empty($post['nuid']) ? $condition[] = ["a.id", "not in", $post['nuid']] : "";
+        isset($post['companyNo']) && $post['companyNo'] !== "" ? $condition[] = ["c.companyCode", "=", $post['companyNo']]
+            : $whereor[] = ["c.companyCode", "=", null];
 
-        $page = isset($post['page'])&& $post['page']!=="" ? intval($post['page']) : 1;
-        $size = isset($post['size'])&& $post['size']!=="" ? intval($post['size']) : 10;
-        $count = Db::name("account")->alias("a")
-			->leftJoin("user b","a.id=b.account_id and b.status=1")
-			->leftJoin("account_company c","a.id=c.account_id and c.status=1 and c.is_del=0")
-			->where($condition)->whereOr($whereor)->count();
-        $total =intval(ceil($count/$size)) ;
-        $page = $total>=$page? $page:$total;
-        $list =  Db::name("account")->alias("a")
-			->leftJoin("user b","a.id=b.account_id and b.status=1")
-			->leftJoin("account_company c","a.id=c.account_id  and c.is_del=0")
-			->where($condition)->whereOr($whereor)->page($page,$size)->order("c.addtime desc,a.addtime desc")
-			->field("a.id,a.username,a.mobile,a.source,a.status,b.nickname,b.sex,b.email,a.addtime,a.updatetime,c.companyCode,c.companyName,c.is_main,c.status as com_status")
-			->cursor();
-        $data=[];
-        foreach ($list as $item){
-        	$item['plat']= Db::name("account_plat")->alias("a")
-        	->leftJoin("platform b","a.plat_code=b.plat_code and b.is_del=0 and b.status=1")
-        	->where(["a.status"=>1,"a.is_del"=>0,"a.account_id"=>$item['id']])->column("a.plat_code,plat_name");
-        	$item['company_relaton'] = Db::name("account_company")->where(["account_id"=>$item['id'],"is_del"=>0])
-				->column("companyCode,companyName,company_type,is_main,status");
-        	$data[]=$item;
-        }
-
-        return json_show(0,"获取成功",["list"=>$data,"count"=>$count]);
-      }
+        $page = isset($post['page']) && $post['page'] !== "" ? intval($post['page']) : 1;
+        $size = isset($post['size']) && $post['size'] !== "" ? intval($post['size']) : 10;
+        $count = Db::name("account")
+            ->alias("a")
+            ->leftJoin("user b", "a.id=b.account_id and b.status=1")
+            ->leftJoin("account_company c", "a.id=c.account_id and c.status=1 and c.is_del=0")
+            ->where($condition)
+            ->whereOr($whereor)
+            ->count();
+        $total = intval(ceil($count / $size));
+        $page = $total >= $page ? $page : $total;
+        $list = Db::name("account")
+            ->alias("a")
+            ->field("a.id,a.username,a.mobile,a.source,a.status,b.nickname,b.sex,b.email,a.addtime,a.updatetime,companyCode,companyName,company_type,is_main,c.status as com_status")
+            ->leftJoin("user b", "a.id=b.account_id and b.status=1")
+            ->leftJoin("account_company c", "a.id=c.account_id  and c.is_del=0")
+            ->where($condition)
+            ->whereOr($whereor)
+            ->page($page, $size)
+            ->append(['plat', 'company_relaton'])
+            ->withAttr('plat', function ($val, $da) {
+                return Db::name("account_plat")
+                    ->alias("a")
+                    ->leftJoin("platform b", "a.plat_code=b.plat_code and b.is_del=0 and b.status=1")
+                    ->where(["a.status" => 1, "a.is_del" => 0, "a.account_id" => $da['id']])
+                    ->field("a.plat_code,plat_name")
+                    ->select()
+                    ->toArray();
+            })
+            ->withAttr('company_relaton', function ($val, $da) {
+                return Db::name("account_company")
+                    ->where(["account_id" => $da['id'], "is_del" => 0])
+                    ->field("companyCode,companyName,company_type,is_main,status")
+                    ->select()
+                    ->toArray();
+            })
+            ->order("a.addtime desc")
+            ->select()
+            ->toArray();
+        return json_show(0, "获取成功", ["list" => $list, "count" => $count]);
+    }
 
 		/**
 		* @return \think\response\Json
@@ -390,7 +405,7 @@ class UserInfo extends BaseController
 
 						 if($u==false)throw new Exception("账户新建失败");
                         Db::commit();
-                        return json_show(0,"账户注册成功");
+                        return json_show(0,"账户注册成功",["userid"=>$reuslt,"nickname"=>$post['nickname']]);
                 }
             }
             Db::rollback();