Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/User.php

@@ -66,32 +66,67 @@ class User extends BaseController
         if($token==""){
             return app_show(101,'token不能为空');
         }
-
         $effetc = VerifyTokens($token);
         if(!empty($effetc) && $effetc['code']!=0){
             return app_show($effetc['code'],$effetc['message']);
         }
         $userinfo=GetUserInfo($token);
         if(empty($userinfo)||$userinfo['code']!=0){
+            return app_show(102,"员工信息不存在");
+        }
+        $id = isset($post['id']) && $post['id'] !==""? trim($post['id']):"";
+        if($id ==""){
+            return error_show(1004,"id不能为空");
+        }
+        $to= GetInfoById($token,['id'=>$id]);
+        if(empty($to)||$to['code']!=0){
             return app_show(1002,"员工信息不存在");
         }
-        $data = $userinfo['data'];
+       // $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")->find();
+            ->field("roleid,role_name,business_all,uid")->find();
         $data['role_name']=isset($role['role_name']) ? $role['role_name'] :"";
         $data['roleid']=isset($role['roleid']) ? $role['roleid'] :"";
+        $st = Db::name('user_business')->where(['userid'=>$role['uid'],"is_del"=>0])->field('businessid,is_main')->select()->toArray();
+        $val=[];
+        if (!empty($st)){
+            foreach ($st as $itom){
+                $tep=[];
+                $business= Db::name('business')->where(['id'=>$itom['businessid'],"is_del"=>0])->field("company,companyNo")->find();
+                $tep['company']=isset($business['company'])?$business['company']:"";
+                $tep['companyNo']=isset($business['companyNo'])?$business['companyNo']:"";
+                $val[]=$tep;
+            }
+        }
+        $data['business'] =$val;
+        $info=[];
+        $stn = Db::name('user_platform')->where(['uid'=>$role['uid']])->find();
+        if($stn!=false){
+          $plat =isset($stn['platform'])?explode(",",$stn['platform']):"";
+          if($plat!=""){
+              $platform = Db::name('platform')->where(['id'=>$stn['platform'],'is_del'=>0])->column("platform_name,platform_code");
+             $info=$platform;
+          }
+
+        }
         $depart = Db::name("depart_user")->where([["uid","=",$data['id']],["is_del","=",0]])->column("itemid");
         $data['depart']="";
+
         if(!empty($depart)){
-            $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")->select();
-            $value['depart_code'] = [];
+            $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")->select()->toArray();
             if(!empty($deparname)){
-                foreach ($deparname as $item) {
-                    $value['depart_code'][] = array_filter(explode("-",$item['depart_link'])) ;
+                foreach ($deparname as $ky=> $item) {
+                    $deparname[$ky]['depart_code']= array_filter(explode("-",$item['depart_link'])) ;
                 }
             }
             $data['depart'] = $deparname;
         }
+//        $info['businessid']=$st['businessid'];
+//        $info['is_main'] = $st['is_main'];
+//        $info['platform']=$stn['platform'];
+        $data['platform']=$info;
+
         return app_show(0,"获取成功",$data);
     }
     /**