ad

app/admin/controller/User.php

@@ -26,6 +26,17 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
         }
+        if(isset($post['status'])){
+            $uid =Db::name("user_role")->where(["status"=>$post['status'],"is_del"=>0])->column("uid");
+            if($post['status']==1){
+            $post['uid']=$uid;
+            }else{
+                $post['nouid']=$uid;
+            }
+            unset($post['status']);
+        }
+
+
         $data = Getlist($token,$post);
         if(!empty($data) && $data['code']!=0){
             return error_show($data['code'],$data['message']);
@@ -173,6 +184,16 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return app_show($effetc['code'],$effetc['message']);
         }
+        if(isset($post['status'])){
+            $uid =Db::name("user_role")->where(["status"=>$post['status'],"is_del"=>0])->column("uid");
+            if($post['status']==1){
+                $post['uid']=$uid;
+            }else{
+                $post['nouid']=$uid;
+            }
+            unset($post['status']);
+        }
+
         $userinfo=GetAccountall($token,$post);
         if(empty($userinfo)||$userinfo['code']!=0){
             return app_show(1002,"员工信息不存在");
@@ -220,8 +241,17 @@ class User extends BaseController
         }
         $itemid = isset($post['itemid']) && $post['itemid']!=="" ? intval($post['itemid']) :"";
         if($itemid!==""){
-            $uid = Db::name("depart_user")->where([["itemid","=",$itemid],["is_del","=",0]])->column("uid");
-            $post['uid'] =$uid;
+            $uids = Db::name("depart_user")->where([["itemid","=",$itemid],["is_del","=",0]])->column("uid");
+            $post['uid'] =$uids;
+        }
+        if(isset($post['status'])){
+            $uid =Db::name("user_role")->where(["status"=>$post['status'],"is_del"=>0])->column("uid");
+            if($post['status']==1){
+                $post['uid']= isset($uids)?array_unique(array_merge($uids,$uid)):$uid;
+            }else{
+                $post['nouid']=$uid;
+            }
+            unset($post['status']);
         }
         $userinfo=GetList($token,$post);
         if(empty($userinfo)||$userinfo['code']!=0){