细节优化

app/admin/controller/Company.php

@@ -234,6 +234,12 @@ class Company extends BaseController
         if($companyNo==""){
             return error_show(1004,"参数companyNo 不能为空");
         }
+
+        $info = Db::name("company_info")
+            ->where(['is_del' => 0, 'companyNo' => $companyNo])
+            ->findOrEmpty();
+        if(empty($info)) return error_show(1004,'该记录不存在');
+
         $status = isset($post['status'])&&$post['status']!="" ? trim($post['status']) :"";
         if($status==""){
             return error_show(1004,"参数status 不能为空");
@@ -241,6 +247,9 @@ class Company extends BaseController
         if(!in_array($status,[0,1])){
             return error_show(1004,"参数status 无效");
         }
+
+        if (($status == 1) && (!in_array($info['input_ticket'], [1, 2]) || !in_array($info['out_ticket'], [1, 2]))) return error_show(1004, '未设置查票字段，无法启用');
+
         $message = $status==1 ?"启用" :"禁用";
         $data = [
             "status"=>$status,
@@ -262,8 +271,12 @@ class Company extends BaseController
         $condition = [["is_del","=",0]];
         $companyNo = isset($post['companyNo'])&& $post['companyNo']!="" ? trim($post['companyNo']) :"";
         if($companyNo!=""){
-            $condition[]=['companyNo',"=",$companyNo];
+            $condition[]=['a.companyNo',"=",$companyNo];
         }
+
+        $relaComNo = isset($post['relaComNo'])&& $post['relaComNo']!="" ? trim($post['relaComNo']) :"";
+        if($relaComNo!="")  $condition[]=['a.companyNo',"=",$relaComNo];
+
         $company_name = isset($post['company_name']) && $post['company_name'] != "" ? trim($post['company_name']) : "";
         if ($company_name != "") {
             $condition[] = ['a.company_name', "like", "%$company_name%"];

app/admin/controller/User.php

@@ -517,7 +517,7 @@ class User extends BaseController{
     {
         $post = $this->request->only(["uid" => 0, "companyCode" => "", "companyName" => "", "page" => 1, "size" => 20], "post", "trim");
 
-        if ($post['uid'] === '') $post['uid'] = $this->uid;
+        if ($post['uid'] == 0) $post['uid'] = $this->uid;
 
         $rs = get_company_list($post);