|
|
@@ -32,8 +32,8 @@ class UserInfo extends BaseController
|
|
|
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']!=="" ? $condition[]=["a.id","in",$post['uid']] : "";
|
|
|
- isset($post['nuid'])&& $post['nuid']!=="" ? $condition[]=["a.id","not in",$post['nuid']] : "";
|
|
|
+ isset($post['uid'])&& !empty($post['uid']) ? $condition[]=["a.id","in",$post['uid']] : "";
|
|
|
+ isset($post['nuid'])&& !empty($post['nuid']) ? $condition[]=["a.id","not in",$post['nuid']] : "";
|
|
|
|
|
|
if ($post['companyNo']!=""){
|
|
|
$uid =Db::name("account_company")->where(["companyCode"=>$post['companyNo'],"is_del"=>0])->column("account_id");
|
|
|
@@ -287,8 +287,8 @@ class UserInfo extends BaseController
|
|
|
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['uid']) && !empty($post['uid'])&& !empty($post['uid']) ? $condition[] = ["a.id", "in", $post['uid']] : "";
|
|
|
+ isset($post['nuid']) &&!empty($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];
|
|
|
|
