ad

app/admin/controller/Company.php

@@ -18,8 +18,8 @@ class Company extends BaseController
     public function Info()
     {
         $post  =$this->post;
-        if($this->level==1){
-        	 $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+         if($this->level==1){
+        	$companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
         }else{
             $companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
         }
@@ -41,7 +41,11 @@ class Company extends BaseController
     public function create()
     {
         $post  =$this->post;
-       $companyNo = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
+       if($this->level==1){
+        	$companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+        }else{
+            $companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+        }
         if($companyNo==""){
             return error_show(1004,"参数companyNo 不能为空");
         }
@@ -214,11 +218,9 @@ class Company extends BaseController
     public function status()
     {
         $post  =$this->post;
-       if($this->level==1){
-        	 $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
-        }else{
-            $companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
-        }
+
+        $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
+
         if($companyNo==""){
             return error_show(1004,"参数companyNo 不能为空");
         }
@@ -248,15 +250,11 @@ class Company extends BaseController
     {
         $post  =$this->post;
         $condition = [["is_del","=",0]];
-        if($this->level==1){
-        	 $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
-        }else{
-            $companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
-        }
+        $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
         if($companyNo!=""){
             $condition[]=['companyNo',"=",$companyNo];
         }
-          $companyName = isset($post['companyName'])&&$post['companyName']!="" ? trim($post['companyName']) :"";
+        $companyName = isset($post['companyName'])&&$post['companyName']!="" ? trim($post['companyName']) :"";
         if($companyName!=""){
             $condition[]=['company_name',"like","%$companyName%"];
         }
@@ -285,15 +283,16 @@ class Company extends BaseController
 
 
         $condition = [["is_del","=",0]];
-        if($this->level==1){
-        	$companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
-        }else{
-            $companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
-        }
+
+        $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
         if($companyNo!=""){
             $condition[]=['companyNo',"=",$companyNo];
         }
-        $list = Db::name("company_info")->where($condition)->field("companyNo,company_name,status,bank_name,bankNo,company_license")->select();
+         $companyName = isset($post['companyName'])&&$post['companyName']!="" ? trim($post['companyName']) :"";
+        if($companyName!=""){
+            $condition[]=['company_name',"like","%$companyName%"];
+        }
+        $list = Db::name("company_info")->where($condition)->field("companyNo,company_name,status,bank_name,bankNo,company_license,LENGTH('company_name') as weight")->order("weight asc")->select();
         return app_show(0,"获取成功",$list);
     }
 

app/admin/controller/Supplier.php

@@ -18,11 +18,7 @@ class Supplier extends BaseController
     {
         $post = $this->post;
         $condition = [];
-       if($this->level==1){
-        	 $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
-        }else{
-            $companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
-        }
+        $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
        if($companyNo!=""){
            $condition []=["code","=",$companyNo];
        }
@@ -53,11 +49,7 @@ class Supplier extends BaseController
     {
         $post = $this->post;
         $condition = [];
-		if($this->level==1){
-        	 $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
-        }else{
-            $companyNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
-        }
+       $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
        if($companyNo!=""){
            $condition []=["code","=",$companyNo];
        }