Browse Source

细节优化

wufeng 2 years ago
parent
commit
0772ddc3bc
2 changed files with 3 additions and 4 deletions
  1. 1 1
      app/admin/controller/UserCompanyBasic.php
  2. 2 3
      app/admin/controller/WareHouse.php

+ 1 - 1
app/admin/controller/UserCompanyBasic.php

@@ -14,7 +14,7 @@ class UserCompanyBasic extends Base
     public function getList()
     {
 
-        $param = $this->request->only(['nickname' => '', 'username' => '', 'status' => '', 'page' => 1, 'size' => 10, 'level' => '2', 'companyNo' => ''], 'post', 'trim');
+        $param = $this->request->only(['nickname' => '', 'username' => '', 'status' => '', 'page' => 1, 'size' => 10, 'level' => '2,3', 'companyNo' => ''], 'post', 'trim');
 
         if ($param['level'] == 1) return json_show(1004, '这里不能查看超管账号');//排除超管账号
 

+ 2 - 3
app/admin/controller/WareHouse.php

@@ -355,8 +355,7 @@ class WareHouse extends Base
 //        }
 
         $userCommon = \app\admin\common\User::getIns();
-        $tmp = $userCommon->handle('bInfo',['companyNo'=>$companyNo]);
-        if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
+        $tmp = $userCommon->handle('getCodeAndName',['code'=>$companyNo]);
         if(empty($tmp['data'])) return json_show(1004,'业务企业未找到');
 
         $user = $userCommon->handle('userinfo',['id'=>$contactor]);
@@ -386,7 +385,7 @@ class WareHouse extends Base
                 'mobile'=>$mobile,
                 'position'=>$position,
                 'companyNo' => $companyNo,
-                'companyName' => $tmp['data']['name'],
+                'companyName' => $tmp['data'][$companyNo],
                 'updaterid'=>$this->uid,
                 'updater'=>$this->uname,
                 "addrs_code"=>json_encode($addrs_code),