ad

app/admin/controller/User.php

@@ -305,10 +305,73 @@ class User extends BaseController
                return error_show(1002,"未找到部门信息");
            }
         }
+        $companyArr = isset($this->post['companyArr'])&&!empty($this->post['companyArr']) ?
+            $this->post['companyArr']:"";
+        if($companyArr==""){
+            return error_show(1004,"参数companyArr不能为空");
+        }
+        $compArr=[];
+        foreach ($companyArr as $value){
+            $tmp=[];
+            if(!isset($value['id'])||$value['id']==''){
+                return error_show(1004,"参数业务公司id不能为空");
+            }
+            $tmp['userid']=$userid;
+            $tmp['businessid']=$userid;
+            $tmp['is_main']=isset($value['is_main'])?$value['is_main']:0;
+            $tmp['is_del']=0;
+            $tmp['addtime']=date("Y-m-d H:i:s");
+            $tmp['updatetime']=date("Y-m-d H:i:s");
+            $compArr[]=$tmp;
+        }
+        $platform = isset($this->post['platform'])&&!empty($this->post['platform']) ?
+            $this->post['platform']:"";
+        if($platform==""){
+            return error_show(1004,"参数platform不能为空");
+        }
+        $plta =Db::name("platform")->where(["id"=>$platform,"is_del"=>0])->select()->toArray();
+        if(empty($plta)){
+            return error_show(1004,"未找到可用平台");
+        }
+        $userplat =Db::name("user_platform")->where(["uid"=>$userid,"is_del"=>0])->find();
+
+        $isall = isset($this->post['is_all'])&&$this->post['is_all']!==""?intval($this->post['is_all']):"0";
 
         Db::startTrans();
         try{
-
+            $sc=Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->select()->toArray();
+            if(!empty($sc)){
+                $del= Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->save(["is_del"=>1,
+                    "updatetime"=>date("Y-m-d H:i:s")]);
+                if($del==false){
+                    Db::rollback();
+                    return error_show(1005,'业务公司添加失败');
+                }
+            }
+            $in = Db::name("user_business")->insertAll($compArr);
+            if($in==0){
+                Db::rollback();
+                return error_show(1005,'业务公司添加失败');
+            }
+            if($userplat==false){
+                $userplat=[
+                    "uid"=>$userid,
+                    "platform"=>implode(",",$platform),
+                    "is_all"=>$isall,
+                    "is_del"=>0,
+                    "addtime"=>date("Y-m-d H:i:s"),
+                    "updatetime"=>date("Y-m-d H:i:s")
+                ];
+            }else{
+             $userplat['platform']= implode(",",$platform);
+             $userplat['is_all']= $isall;
+             $userplat['updatetime']= date("Y-m-d H:i:s");
+            }
+            $patup =Db::name("user_platform")->save($userplat);
+            if($patup==false){
+                Db::rollback();
+                return error_show(1005,'业务平台添加失败');
+            }
             $userrole = Db::name("user_role")->where(["uid"=>$userid,"is_del"=>0])->find();
             if(empty($userrole)){
                 $roledata =[
@@ -325,17 +388,6 @@ class User extends BaseController
                 $up=Db::name("user_role")->save($userrole);
             }
             if($up){
-                $data=[
-                    "id"=>$userid,
-                    "nickname"=>$nickname,
-                    "mobile"=>$mobile,
-                    "email"=>$email
-                ];
-                $save =resetinfo($toke,$data);
-                if(!empty($save) && $save['code']!=0){
-                    Db::rollback();
-                    return error_show($save['code'],$save['message']);
-                }
                  Db::name("depart_user")->where(["uid"=>$userid])->save(['is_del'=>1]);
                 if(isset($item_arr)&&!empty($item_arr)){
                     foreach ($item_arr as $v){
@@ -359,13 +411,23 @@ class User extends BaseController
                        }
                     }
                 }
-                Db::commit();
-                return app_show(0,"更新成功");
             }else{
                 Db::rollback();
                 return error_show(1005,'角色更新失败');
             }
-
+            $data=[
+                "id"=>$userid,
+                "nickname"=>$nickname,
+                "mobile"=>$mobile,
+                "email"=>$email
+            ];
+            $save =resetinfo($toke,$data);
+            if(!empty($save) && $save['code']!=0){
+                Db::rollback();
+                return error_show($save['code'],$save['message']);
+            }
+            Db::commit();
+            return app_show(0,"更新成功");
         }catch(\Exception $e){
             Db::rollback();
             return app_show(1002,$e->getMessage());

app/admin/controller/WareHouse.php

@@ -388,6 +388,10 @@ class WareHouse extends BaseController
         if($supplier!=""){
             $condition[]=["supplierNo","=",$supplier];
         }
+        $company = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
+        if($company!=""){
+            $condition[]=["companyNo","=",$company];
+        }
         $wsm_type = isset($post['wsm_type'])&&$post['wsm_type']!="" ? intval($post['wsm_type']) :"1";
          $condition[]=["a.wsm_type","=",$wsm_type];
         $list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")