ad

app/admin/controller/TagGood.php

@@ -15,7 +15,11 @@ class TagGood extends BaseController{
         if($type==''){
             return error_show(1004,"参数 type 不能未空");
         }
-        $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+        if($post['relaComNo']!=""){
+        	$companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+        }else{
+        	 $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+        }
         if($companyNo==''){
             return error_show(1004,"参数 companyNo 不能未空");
         }
@@ -23,7 +27,8 @@ class TagGood extends BaseController{
         if($tagName==''){
             return error_show(1004,"参数 tag_name 不能未空");
         }
-        $isT =Db::name("order_tag")->where(["type"=>$type,"tag_name"=>$tagName,"is_del"=>0])->findOrEmpty();
+        $isT =Db::name("order_tag")->where(["type"=>$type,"companyNo"=>$companyNo,"tag_name"=>$tagName,"is_del"=>0])
+        ->findOrEmpty();
         if(!empty($isT)){
                return error_show(1004,"标签名称已存在");
         }
@@ -46,7 +51,11 @@ class TagGood extends BaseController{
         $size = isset($this->post['size'])&&$this->post['size']!=''?intval($this->post['size']):15;
         $type = isset($this->post['type'])&&$this->post['type']!=''?intval($this->post['type']):'';
         $status = isset($this->post['status'])&&$this->post['status']!==''?intval($this->post['status']):'';
-         $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+        if($this->post['relaComNo']!=""){
+        	$companyNo = isset($this->post['relaComNo'])&& $this->post['relaComNo']!="" ? trim($this->post['relaComNo']) :"";
+        }else{
+        	 $companyNo = isset($this->post['companyNo'])&& $this->post['companyNo']!="" ? trim($this->post['companyNo']) :"";
+        }
         $condition =[["is_del","=",0]];
         if($type!=''){
             $condition[]=["type","=",$type];
@@ -74,7 +83,11 @@ class TagGood extends BaseController{
         if($type!=''){
             $condition[]=["type","=",$type];
         }
-        $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+        if($this->post['relaComNo']!=""){
+        	$companyNo = isset($this->post['relaComNo'])&& $this->post['relaComNo']!="" ? trim($this->post['relaComNo']) :"";
+        }else{
+        	 $companyNo = isset($this->post['companyNo'])&& $this->post['companyNo']!="" ? trim($this->post['companyNo']) :"";
+        }
          if($companyNo!=''){
           $condition[]=["companyNo","=",$companyNo];
         }
@@ -125,7 +138,11 @@ class TagGood extends BaseController{
         if($type==''){
            return error_show(1004,"参数 type 不能为空");
         }
-         $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+          if($this->post['relaComNo']!=""){
+        	$companyNo = isset($this->post['relaComNo'])&& $this->post['relaComNo']!="" ? trim($this->post['relaComNo']) :"";
+        }else{
+        	 $companyNo = isset($this->post['companyNo'])&& $this->post['companyNo']!="" ? trim($this->post['companyNo']) :"";
+        }
          if($companyNo==''){
           return error_show(1004,"参数 companyNo 不能为空");
         }

app/admin/controller/User.php

@@ -415,18 +415,6 @@ class User extends BaseController{
         	if(!isset($saev['code'])||$saev['code']!=0){
 				return error_show(1004,$saev['message']);
         	}
-//        	if($post['relaComNo']!=""){
-//				$company =Db::name("supplier_info")->where(["code"=>$post['relaComNo']])->find();
-//				if($company){
-//					$temp = [
-//						"companyCode"=>$company["code"],
-//						"companyName"=>$company["name"],
-//						"company_type"=>$company["type"]==3?2:1,
-//						"is_main"=>1,
-//					];
-//					$post['companyArr'][]=$temp;
-//				}
-//        	}
 			if(!empty($post['companyArr'])){
 				$companyinfo = ["id"=>$post['id'],"company"=>$post['companyArr'],"token"=>$post['token']];
 				$companyset =setUserCompany($companyinfo);