修复搜索错误

Application/Admin/Controller/CompanyRelationController.class.php

@@ -57,6 +57,11 @@ class CompanyRelationController extends AdminController
         if(isset($params['company_id'])){
             $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')";
         }
+        if(isset($params['company_type']) && isset($params['company_id'])){
+            unset($where['_string']);
+            $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')";
+        }
+
         if(isset($params['settlement_type'])){
             $where['settlement_type'] = $params['settlement_type'];
         }
@@ -129,7 +134,13 @@ class CompanyRelationController extends AdminController
         }
         if(isset($params['company_id'])){
             $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')";
+        
         }
+        if(isset($params['company_type']) && isset($params['company_id'])){
+            unset($where['_string']);
+            $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')";
+        }
+
         if(isset($params['settlement_type'])){
             $where['settlement_type'] = $params['settlement_type'];
         }

Application/Admin/View/CompanyRelation/index.html

@@ -195,17 +195,19 @@ $(function(){
             $("#search").click();
         }
     });
-    var company_id = "{$_GET['company_id']??0}";
 
+    var loop = 1;
+    var company_id = "{$_GET['company_id']??0}";
     $("#company_type").on("change",function(){
         var type =  $(this).find("option:selected").val();
-        var typename=setTypeName(type);
+        if(type != ''){
             var url = "{:U('getCompanyList')}"+"&type="+type;
             $.get(url,function(data){
                 var company = data.info;
-            var companystr = '<option value="">'+typename+'</option>';
+                console.log(company)
+                var companystr = '<option value="">请选择合作公司</option>';
                 for (var i in company) {
-                if(company[i].id == company_id){
+                    if(company[i].id == company_id && loop==1){
                         companystr += "<option value='" + company[i].id + "' selected='selected'>" + company[i].company_name + "</option>"
                     }else{
                         companystr += "<option value='" + company[i].id + "'>" + company[i].company_name + "</option>"
@@ -213,30 +215,16 @@ $(function(){
                 }
                 $("#company_id").html(companystr);
                 $("#company_id").select2();
+                loop++;
             })
+        }else{
+            var companystr = '<option value="">请先选择合作公司</option>';
+            $("#company_id").html(companystr);
+            $("#company_id").select2();
+        }
     })
     $("#company_type").change();
 
-    function setTypeName(type) {
-        var typename = '';
-        switch (type) {
-            case '':
-                typename ="请先选择公司类型";
-                break;
-            case '0':
-                typename = "请选择已方公司";
-                break;
-            case "1":
-                typename = "请选择上游CP公司";
-                break;
-            case "2":
-                typename ="请选择联运下游渠道公司";;
-                break;
-            default:
-                break;
-        }
-        return typename;
-    }
 })
 
 

Application/Admin/View/CompanyRelation/lists.html

@@ -268,17 +268,18 @@ $(function(){
             $("#search").click();
         }
     });
+    var loop = 1;
     var company_id = "{$_GET['company_id']??0}";
-    
     $("#company_type").on("change",function(){
         var type =  $(this).find("option:selected").val();
-        var typename=setTypeName(type);
+        if(type != ''){
             var url = "{:U('getCompanyList')}"+"&type="+type;
             $.get(url,function(data){
                 var company = data.info;
-            var companystr = '<option value="">'+typename+'</option>';
+                console.log(company)
+                var companystr = '<option value="">请选择合作公司</option>';
                 for (var i in company) {
-                if(company[i].id == company_id){
+                    if(company[i].id == company_id && loop==1){
                         companystr += "<option value='" + company[i].id + "' selected='selected'>" + company[i].company_name + "</option>"
                     }else{
                         companystr += "<option value='" + company[i].id + "'>" + company[i].company_name + "</option>"
@@ -286,11 +287,16 @@ $(function(){
                 }
                 $("#company_id").html(companystr);
                 $("#company_id").select2();
+                loop++;
             })
+        }else{
+            var companystr = '<option value="">请先选择合作公司</option>';
+            $("#company_id").html(companystr);
+            $("#company_id").select2();
+        }
     })
     $("#company_type").change();
 
-
     $(".editRelation").on("click",function(){
         var id = $(this).data("id");
         var url = "{:U('editRelation')}"+"&id="+id;
@@ -382,26 +388,6 @@ $(function(){
             });
         }
     })
-    function setTypeName(type) {
-        var typename = '';
-        switch (type) {
-            case '':
-                typename ="请先选择公司类型";
-                break;
-            case '0':
-                typename = "请选择已方公司";
-                break;
-            case "1":
-                typename = "请选择上游CP公司";
-                break;
-            case "2":
-                typename ="请选择联运下游渠道公司";;
-                break;
-            default:
-                break;
-        }
-        return typename;
-    }
 })