Merge branch 'version1.5' into dev_wf

app/admin/controller/Platform.php

@@ -22,6 +22,10 @@ class Platform extends Base
             return error_show(1003,"参数platform_name不能为空");
 
         }
+        $is_exit= Db::name("platform")->where(["platform_name"=>$platform_name])->find();
+        if($is_exit){
+            return error_show(1003,"平台名称已存在");
+        }
         $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !=="" ? intval($this->post['platform_type']):"";
         if($platform_type===""){
             return error_show(1002,"参数platform_type不能为空");
@@ -118,6 +122,10 @@ class Platform extends Base
         if ($token == '') {
             return error_show(1005, "参数token不能为空");
         }
+        $is_exit= Db::name("platform")->where([["platform_name","=",$platform_name],["id","<>",$id]])->find();
+        if($is_exit){
+            return error_show(1003,"平台名称已存在");
+        }
 //        $user = GetUserInfo($token);
 //        if (empty($user) || $user['code'] != 0) {
 //            return error_show(102, "创建人数据不存在");

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'])&&$post['status']!==''){
+            $uid =Db::name("user_role")->where(["status"=>1,"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']);
@@ -38,7 +49,7 @@ class User extends BaseController
             $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
             $depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
-            $value['status']=isset($role['status'])?0:$role['status'];
+            $value['status']=isset($role['status'])?$role['status']:0;
             if(!empty($depart)){
                 $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("id,name,depart_link");
                 $value['depart_code'] = [];
@@ -87,9 +98,10 @@ class User extends BaseController
        // $nickname = isset($to['data']['nickname']) &&$to['data']['nickname']!="" ? $to['data']['nickname'] :"" ;
         $data = $to['data'];
         $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$data['id'])
-            ->field("roleid,role_name,business_all,uid")->find();
+            ->field("roleid,role_name,business_all,uid,a.status")->find();
         $data['role_name']=isset($role['role_name']) ? $role['role_name'] :"";
         $data['roleid']=isset($role['roleid']) ? $role['roleid'] :"";
+        $data['status']=isset($role['status'])?$role['status']:0;
         $st = Db::name('user_business')->where(['userid'=>$role['uid'],"is_del"=>0])->field('businessid,is_main')->select()->toArray();
         $val=[];
         if (!empty($st)){
@@ -172,6 +184,16 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return app_show($effetc['code'],$effetc['message']);
         }
+        if(isset($post['status'])&&$post['status']!==''){
+            $uid =Db::name("user_role")->where(["status"=>1,"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,"员工信息不存在");
@@ -185,7 +207,7 @@ class User extends BaseController
             $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
             $depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
-            $value['status']=isset($role['status'])?0:$role['status'];
+            $value['status']=isset($role['status'])?$role['status']:0;
             if(!empty($depart)){
                 $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
                     ->select()->toArray();
@@ -219,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'])&&$post['status']!==''){
+            $uid =Db::name("user_role")->where(["status"=>1,"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){
@@ -230,11 +261,12 @@ class User extends BaseController
         $list=[];
         foreach ($data as $value){
             $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$value['id'])
-                ->field("roleid,role_name")->find();
+                ->field("roleid,role_name,a.status")->find();
             $value['roleid'] = isset($role['roleid']) ? $role['roleid'] :"";
             $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
             $depart = Db::name("depart_user")->where([["uid","=",$data['uid']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
+            $value['status']=isset($role['status'])?$role['status']:0;
             if(!empty($depart)){
                 $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
                     ->select()->toArray();