Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Consult.php

@@ -204,7 +204,7 @@ class Consult extends Base
         if (empty($platform)) return json_show(1004, '该平台不存在');
         if ($platform['status'] != 1) return json_show(1004, '该平台已禁用');
         $pay_id = $platform_code;
-         if ($platform['is_select_pay_rate'] == 1&& channel_is_company($platform_code,$companyNo))return error_show(1004, "平台渠道含有业务公司");
+         if ($platform['is_select_pay_rate'] == 1&& channel_is_company($platform_code,$companyNo))return error_show(1004, "平台渠道包含当前业务公司");
 
         $ladder = isset($this->post['ladder'])&&!empty($this->post['ladder']) ? $this->post['ladder']:"";
         if($ladder==""){
@@ -900,7 +900,7 @@ class Consult extends Base
                 ->where(['is_del' => 0, 'id' => $zx['platform_code']])
                 ->value('is_select_pay_rate', 0);
             if ($is_select_pay_rate == 1) {
-               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道含有业务公司{$supplierNo}");
+               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道包含当前业务公司{$supplierNo}");
 //                if (!empty($temp)) return json_show(1004, '招标任务平台已存在该供应商，请更换其他供应商');
             }
         }
@@ -1246,7 +1246,7 @@ class Consult extends Base
                 ->where(['is_del' => 0, 'id' => $zx['platform_code'],"status"=>1])
                 ->value('is_select_pay_rate', 0);
             if ($is_select_pay_rate == 1) {
-               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道含有业务公司{$supplierNo}");
+               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道包含当前业务公司{$supplierNo}");
 //
             }
         }

app/admin/controller/Filing.php

@@ -247,7 +247,7 @@ class Filing extends Base
         if (empty($tmp)) return json_show(1005, '该平台不存在');
         if ($tmp['status'] != 1) return error_show(1004, "平台信息已禁用");
 	    if($tmp['is_select_pay_rate']==1 && channel_is_company($param['platform_id'],$param['companyCode']))return
-	    error_show(1004, "平台渠道含有 {$company['data']['companyName']}");
+	    error_show(1004, "平台渠道包含当前业务公司 {$company['data']['companyName']}");
 
 
         //校验支付渠道中的业务公司是否与报备单业务公司重复
@@ -728,7 +728,7 @@ class Filing extends Base
 
 //	            $supplierArr = Db::name("platform_pay_rate")->where(["platform_id" => $param['platform_id'], "status" => 1, "is_del" => 0])->column("companyNo");
 //	            if (in_array($param['companyNo'], $supplierArr)) return error_show(1004, "平台支付渠道含有该业务公司，平台无法使用！");
-	             if($payinfo['is_select_pay_rate']==1 && channel_is_company($param['platform_id'],$param['companyNo']))return error_show(1004, "平台渠道含有 {$tmp['data'][$param['companyNo']]}");
+	             if($payinfo['is_select_pay_rate']==1 && channel_is_company($param['platform_id'],$param['companyNo']))return error_show(1004, "平台渠道包含当前业务公司 {$tmp['data'][$param['companyNo']]}");
 
 		$supplierinfo = $userCommon->handle("hqInfo",["code"=>$param['supplierNo']]);
 		if(!isset($supplierinfo['data'])|| empty($supplierinfo['data'])) return json_show(1004, "未找到供应商公司数据");

app/admin/controller/Project.php

@@ -40,7 +40,7 @@ class Project extends Base
             ->findOrEmpty();
         if (empty($platform_temp)) return json_show(1004, '该平台不存在');
         if ($platform_temp['status'] != 1) return json_show(1004, '该平台已被启用');
-        if ($platform_temp['is_select_pay_rate'] == 1&& channel_is_company($platform,$companyNo))return error_show(1004, "平台渠道含有业务公司");
+        if ($platform_temp['is_select_pay_rate'] == 1&& channel_is_company($platform,$companyNo))return error_show(1004, "平台渠道包含当前业务公司");
 
 
         $use_desc = isset($this->post['use_desc'])&&$this->post['use_desc']!=""?trim($this->post['use_desc']):"";

app/admin/controller/Sale.php

@@ -55,7 +55,7 @@ class Sale extends Base
         $platforminfo = Db::name("platform")->where(["id"=> $platform_id,"is_del"=>0])->findOrEmpty();
         if (empty($platforminfo)) return error_show(1004, "平台信息未找到");
         if ($platforminfo['status'] != 1) return error_show(1004, "平台信息已禁用");
-        if($platforminfo['is_select_pay_rate']==1 && channel_is_company($platform_id,$supplierNo))return error_show(1004, "平台渠道含有 {$tmp['data'][$supplierNo]}");
+        if($platforminfo['is_select_pay_rate']==1 && channel_is_company($platform_id,$supplierNo))return error_show(1004, "平台渠道包含当前业务公司 {$tmp['data'][$supplierNo]}");
         $platform_order = isset($this->post['platform_order']) && $this->post['platform_order'] !== "" ? trim($this->post['platform_order']) : "";
         $good_code = isset($this->post['good_code']) && $this->post['good_code'] !== "" ? trim($this->post['good_code']) : "";
         if ($good_code == '') {

app/common.php

@@ -1712,7 +1712,7 @@ if(function_exists('channel_is_company')==false){
     	$platform=Db::name("platform_channel")
     	->alias("a")
     	->leftJoin("channel b","a.channel_id=b.id")
-    	->where(["a.is_del"=>0,"b.is_del"=>0,"b.status"=>1,"a.id"=>$platform_id])
+    	->where(["a.is_del"=>0,"b.is_del"=>0,"b.status"=>1,"a.platform_id"=>$platform_id])
     	->column("b.companyNo");
     	if(in_array($companyNo,$platform))return true;
 		return false;