Переглянути джерело

$userCommon使用单例模式获取,避免重复获取实例对象

wufeng 2 роки тому
батько
коміт
19ad090df2

+ 22 - 1
app/admin/common/User.php

@@ -90,7 +90,16 @@ class User
 
     ];
 
-    public function __construct()
+    private static $obj = null;
+
+    public static function getIns()
+    {
+        if (is_null(self::$obj)) self::$obj = new self;
+        return self::$obj;
+    }
+
+    //禁止new
+    private function __construct()
     {
         $this->Sign = new Sign($this->appid, $this->appkey);
         $this->host = env("user.hosturl", '');
@@ -217,5 +226,17 @@ class User
         exit;
     }
 
+    //禁止外部克隆
+    private function __clone()
+    {
+
+    }
+
+    //禁止实例化
+    private function __wakeup()
+    {
+
+    }
+
 
 }

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

@@ -226,7 +226,7 @@ class Brand extends Base
             ->findOrEmpty();
         if ($data) {
 
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
             $sinfo = $userCommon->handle('sInfo', ['code' => $data['gyscode']]);
             $data['name'] = $sinfo['data']['name'] ?? '';
             $data['status'] = $sinfo['data']['status'] ?? '';

+ 6 - 6
app/admin/controller/Customar.php

@@ -25,7 +25,7 @@ class Customar extends Base
         $param['uid']= $this->uid;
         $param['uname']= $this->uname;
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('cCreate',$param);
 
         return json_show($rs['code'],$rs['message'],$rs['data']);
@@ -151,7 +151,7 @@ class Customar extends Base
     public function list()
     {
         $param = $this->request->filter('trim')->post();
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('cList',$param);
 
         return json_show($rs['code'],$rs['message'],$rs['data']);
@@ -195,7 +195,7 @@ class Customar extends Base
         $param['uid']= $this->uid;
         $param['uname']= $this->uname;
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('cEdit',$param);
 
         return json_show($rs['code'],$rs['message'],$rs['data']);
@@ -321,7 +321,7 @@ class Customar extends Base
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo == "")   return error_show(1002, "参数companyNo不能为空");
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('cInfo',['companyNo'=>$companyNo]);
 
         return json_show($rs['code'],$rs['message'],$rs['data']);
@@ -350,7 +350,7 @@ class Customar extends Base
 
         $param = $this->request->only(['id' => 0], 'post', 'trim');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('delete', [
             'ids' => [$param['id']],
             'type' => 2,
@@ -390,7 +390,7 @@ class Customar extends Base
             'updater' => $this->uname,
             'updaterid' => $this->uid,
         ]);
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('status', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
 //        $info =  Db::name("customer_info")->where([["id","=",$id],["is_del","=",0]])->find();

+ 7 - 7
app/admin/controller/Purch.php

@@ -131,7 +131,7 @@ class Purch extends Base
 //		$role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["sip.personid", "in", $role[DataGroupModel::$type_全部]];
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 
         //只有level2的账号过滤数据权限
         if ($this->level == 2) {
@@ -379,7 +379,7 @@ class Purch extends Base
                 $goon["brand_id"] = "";
             }
 
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
 
             $supplier = $userCommon->handle('sInfo', ['code' => $goon['supplierNo']]);
 //            $supplier = Db::name("supplier")->where(["code"=>$goon['supplierNo']])->find();
@@ -576,7 +576,7 @@ class Purch extends Base
         }
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""?trim($this->post['supplierNo']) :"";
         if($supplierNo!=""){
-        	$userCommon = new \app\admin\common\User();
+        	$userCommon = \app\admin\common\User::getIns();
                 $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $supplierNo]);
 //            $supplier =Db::name("supplier")->where(['code'=>$supplierNo])->find();
 		 if($supplier_temp['code']!=0 || empty($supplier_temp['data']) )   return error_show(1004,"未找到供应商信息");
@@ -669,7 +669,7 @@ class Purch extends Base
 //                ->field('id,name supplierName,code supplierNo,person,personid')
 //                ->where(['is_del' => 0, 'code' => $param['supplierNo']])
 //                ->find();
-			$userCommon= new \app\admin\common\User();
+			$userCommon= \app\admin\common\User::getIns();
             $supplier_temp =$userCommon->handle("sInfo",["code"=>$param['supplierNo']]);
 
             if ($supplier_temp['code']!=0 || empty($supplier_temp['data'])) throw new Exception('查不到该供应商的记录');
@@ -797,7 +797,7 @@ class Purch extends Base
             if ($upd) {
 
                 //获取供应商的负责人
-                $userCommon = new \app\admin\common\User();
+                $userCommon = \app\admin\common\User::getIns();
                 $supplier = $userCommon->handle('sGetList',['more_code'=>array_column($info, 'supplierNo')]);
 
                 $supplier_cgderid = array_column($supplier['data']['list'],'personid','code');
@@ -905,7 +905,7 @@ class Purch extends Base
                         return error_show(1002,"未找到确认单信息");
                     }
          }
-		$userCommon = new \app\admin\common\User();
+		$userCommon = \app\admin\common\User::getIns();
 		$supp =$userCommon->handle("getCodeAndName",["code"=>[$cg['companyNo'],$order['customer_code']??"",$order['supplierNo']??""]]);
 		$SuppArr= $supp['data']??[];
         $rid= $this->uid;
@@ -1281,7 +1281,7 @@ class Purch extends Base
             ->toArray();
 
         $all_supplierNo = array_column($list, 'supplierNo');
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName', ['code' => $all_supplierNo]);
 
         foreach ($list as &$value) {

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

@@ -218,7 +218,7 @@ public function backfe(){
             return error_show(1002,"未找到商品数据");
         }
 
-        $userCommon=new \app\admin\common\User();
+        $userCommon=\app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>$dom['supplierNo']]);
 //        $supplier=Db::name("supplier")->where(["code"=>$dom['supplierNo']])->find();
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];

+ 8 - 8
app/admin/controller/Purchin.php

@@ -150,7 +150,7 @@ class Purchin extends Base
         $item = get_company_name_by_uid($all_createrid);
 
         //获取采购单供应商和仓库供应商的名称
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_merge(array_column($list,'companyNo'),array_column($list,'wsm_supplierNo')))]);
 
         $all_supplier = $userCommon->handle('sGetList',['more_code'=>array_column($list,'supplierNo'),'page'=>1,'size'=>$size]);
@@ -355,7 +355,7 @@ class Purchin extends Base
 //                $personid = Db::name('supplier')
 //                    ->where('code', $cgdinfo['supplierNo'])
 //                    ->value('personid');
-//				$userCommon= new \app\admin\common\User();
+//				$userCommon= \app\admin\common\User::getIns();
 //	            $supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
 
 //                if ($supplier_temp['code']!=0 || empty($supplier_temp['data'])) throw new Exception('查不到该供应商的记录');
@@ -364,7 +364,7 @@ class Purchin extends Base
 //                if ($this->uid != $personid) throw new Exception('只能由供应商负责人操作');
 //                }
 
-                $userCommon = new \app\admin\common\User();
+                $userCommon = \app\admin\common\User::getIns();
                 $supplier_temp = $userCommon->handle('sInfo',['code'=>$cgdinfo['supplierNo']]);
                 $person = $supplier_temp['data'];
 
@@ -685,7 +685,7 @@ class Purchin extends Base
         $info['company'] = '';
         if(isset($dom['companyNo'])&&$dom['companyNo']!=""){
 //            $company = Db::name("business")->where(["companyNo"=>$dom['companyNo']])->find();
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
             $tmp = $userCommon->handle('getCodeAndName', ['code' => [$dom['companyNo']]]);
             $info['company'] = $tmp['data'][$dom['companyNo']]??'';
         }
@@ -795,7 +795,7 @@ class Purchin extends Base
             return error_show(1002,"未找到采购单数据");
           }
         $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']) :"";
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -1075,7 +1075,7 @@ class Purchin extends Base
             if(empty($cgdinfo)){
                 return error_show(1002,"未找到采购单数据");
             }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -1287,7 +1287,7 @@ class Purchin extends Base
             "status"=>1,
             "updatetime"=>date("Y-m-d H:i:s")
         ];
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -1511,7 +1511,7 @@ class Purchin extends Base
             ->toArray();
         $data=[];
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'companyNo'))]);
 
         foreach ($list as $value){

+ 8 - 8
app/admin/controller/Resign.php

@@ -125,7 +125,7 @@ class Resign extends Base
         $data=[];
         $all_createrid = array_column($list,'apply_id');
         $item = get_company_name_by_uid($all_createrid);
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $wsmCodes = array_column($list,'wsm_code');
         $wsmcode = Db::name("warehouse_info")->alias("a")
                     ->where(["a.wsm_code"=>$wsmCodes])->column("a.name as wsm_name,a.supplierNo as code","wsm_code");
@@ -174,7 +174,7 @@ class Resign extends Base
         if($good==false){
             return error_show(1004,"未找到商品数据");
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$good['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"商品供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -260,7 +260,7 @@ class Resign extends Base
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -313,7 +313,7 @@ class Resign extends Base
             $file= basename($info['file_url']);
             $info['file_name'] =substr($file,0,strripos($file,"_"));
         }
-//        $userCommon = new \app\admin\common\User();
+//        $userCommon = \app\admin\common\User::getIns();
         if($info['wsm_code']!=""){
             $wsmcode = Db::name("warehouse_info")->where(["wsm_code"=>$info['wsm_code']])->field("name as wsm_name,supplierNo,supplierName")->find();
 //			$tmpd = $userCommon->handle('getCodeAndName', ['code' =>$wsmcode['supplierNo']]);
@@ -434,7 +434,7 @@ class Resign extends Base
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -652,7 +652,7 @@ class Resign extends Base
             return error_show(1001,'参数status 不能为空');
         }
         $remark = isset($this->post['remark'])&& $this->post['remark']!=='' ? trim($this->post['remark']) : "";
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$feed['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -816,7 +816,7 @@ class Resign extends Base
         if($wsminfo==false){
             return error_show(1004,"未找到仓库数据");
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -877,7 +877,7 @@ class Resign extends Base
         if($good==false){
             return error_show(1004,"未找到商品数据");
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$info['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"未找到供应商数据");
 		$supplierName=$supplier_temp['data']['name']??'';

+ 2 - 2
app/admin/controller/Resigninfo.php

@@ -78,7 +78,7 @@ class Resigninfo extends Base
 
         if ($val->check($post) == false) return json_show(1004, $val->getError());
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('userlist', ['uid' => [$post['resign_uid'], $post['hand_uid']]]);
         $uid_nickname = array_column($rs['data']['list'], 'nickname', 'id');
 
@@ -152,7 +152,7 @@ class Resigninfo extends Base
 
         if ($val->check($post) == false) return json_show(1004, $val->getError());
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('userlist', ['uid' => [$post['resign_uid'], $post['hand_uid']]]);
         $uid_nickname = array_column($rs['data']['list'], 'nickname', 'id');
 

+ 2 - 2
app/admin/controller/Salezx.php

@@ -101,7 +101,7 @@ class Salezx extends \app\BaseController
         Db::startTrans();
       try {
 
-          $userCommon = new \app\admin\common\User();
+          $userCommon = \app\admin\common\User::getIns();
           $tmp = $userCommon->handle('sInfo',['code'=>$good['supplierNo']]);
           if(!isset($tmp['code']) || $tmp['code']!=0) throw new Exception($tmp['message']);
           $supplier_temp_info = $tmp['data'];
@@ -626,7 +626,7 @@ class Salezx extends \app\BaseController
                     ->leftJoin('purchease_order b','b.is_del=0 AND b.cgdNo=a.cgdNo')
                     ->value('supplierNo','');
                 if($supplierNo !=''){
-                    $userCommon=new \app\admin\common\User();
+                    $userCommon=\app\admin\common\User::getIns();
                     $tmp = $userCommon->handle('sInfo',['code'=>$supplierNo]);
                     if(isset($tmp['data'])){
                         $ord = ["order_type" => "CKD", "order_code" => $der['outCode'], "order_id" => $der['id'], "order_status" => $der['status'], 'holder_id' => $der['apply_id'], 'wait_id' => $tmp['data']['personid'], 'wait_name' => $tmp['data']['person']];

+ 5 - 5
app/admin/controller/WareHouse.php

@@ -96,7 +96,7 @@ class WareHouse extends Base
 //            return error_show(1004,"业务企业未找到");
 //        }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName', ['code' => [$post['companyNo'], $post['supplierNo']]]);
         if (!isset($tmp['data'][$post['companyNo']])) return json_show(1004, '业务企业未找到');
         if (!isset($tmp['data'][$post['supplierNo']])) return json_show(1004, '供应商未找到');
@@ -248,7 +248,7 @@ class WareHouse extends Base
         $item = get_company_name_by_uid($all_createrid);
 
         $all_companyNo = array_column($list,'companyNo');
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_companyNo]);
 
         foreach ($list as $key=>$value){
@@ -288,7 +288,7 @@ class WareHouse extends Base
             ->findOrEmpty();
         if(empty($warse))  return error_show(1004,"未找到数据");
 
-//        $userCommon = new \app\admin\common\User();
+//        $userCommon = \app\admin\common\User::getIns();
 //        $tmp = $userCommon->handle('getCodeAndName',['code'=>[$warse['supplierNo'],$warse['companyNo']]]);
 //        if($warse['supplierNo']!=""){
 //            $supplierinfo = Db::name("supplier")->where(["code"=>$warse['supplierNo']])->find();
@@ -354,7 +354,7 @@ class WareHouse extends Base
 //            return error_show(1004,"业务企业未找到");
 //        }
 
-        $userCommon = new \app\admin\common\User();
+        $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']);
         if(empty($tmp['data'])) return json_show(1004,'业务企业未找到');
@@ -492,7 +492,7 @@ class WareHouse extends Base
             ->toArray();
 
 //        $all_companyNo = array_column($list, 'companyNo');
-//        $userCommon = new \app\admin\common\User();
+//        $userCommon = \app\admin\common\User::getIns();
 //        $tmp = $userCommon->handle('getCodeAndName', ['code' => $all_companyNo]);
 
         $data=[];

+ 14 - 14
app/common.php

@@ -24,7 +24,7 @@ function error_show($code=0,$message=""){
 
 function GetUserInfo($token){
 
-    $userCommon = new \app\admin\common\User();
+    $userCommon = \app\admin\common\User::getIns();
     return $userCommon->handle('verifyToken',['token'=>$token]);
 
 //    $host = Config::get("app");
@@ -115,7 +115,7 @@ function VerifyTokens($token){
 //    ];
 //    $response=curl_request($url,$data);
 
-    $userCommon = new CommonUser();
+    $userCommon = CommonUser::getIns();
     $rs = $userCommon->VerifyTokens(['token'=>$token]);
 
     return json_decode($rs,true);
@@ -128,7 +128,7 @@ function VerifyTokens($token){
  * @return mixed
  */
 function GetUserlist($token,$condition){
-    $userCommon = new CommonUser();
+    $userCommon = CommonUser::getIns();
     return json_decode($userCommon->GetUserlist($condition), true);
 }
 
@@ -138,12 +138,12 @@ function GetUserlist($token,$condition){
  * @return mixed
  */
 function GetAccountall($token, $condition){
-    $userCommon = new CommonUser();
+    $userCommon = CommonUser::getIns();
     return json_decode($userCommon->GetAccountall($condition), true);
 }
 
 function GetList($condition){
-    $userCommon = new CommonUser();
+    $userCommon = CommonUser::getIns();
     return json_decode($userCommon->GetUserlist($condition), true);
 }
 
@@ -153,12 +153,12 @@ function GetList($condition){
  * @return mixed
  */
 function GetInfoById($token,$condition){
-    $userCommon = new CommonUser();
+    $userCommon = CommonUser::getIns();
     return json_decode($userCommon->GetUserInfo($condition), true);
 }
 
 function GetInfoNoToken($condition){
-    $userCommon = new CommonUser();
+    $userCommon = CommonUser::getIns();
     return json_decode($userCommon->GetUserInfo($condition), true);
 }
 
@@ -382,7 +382,7 @@ function crea($data,$vio=0)
 //根据部门id获取部门名称(层级名称)
 function GetPart($id,$data=[]){
 
-    $userCommon = new \app\admin\common\User();
+    $userCommon = CommonUser::getIns();
     $rs = $userCommon->handle('get_part',['itemid'=>$id]);
 
     return $rs['data'];
@@ -1148,7 +1148,7 @@ if (!function_exists('get_logistics_information')) {
 if (!function_exists('get_top_customer_org')) {
     function get_top_customer_org($var)
     {
-        $userCommon = new \app\admin\common\User();
+        $userCommon = CommonUser::getIns();
         $rs = $userCommon->handle('get_top_customer_org', ['itemid' => is_array($var) ? $var : [$var]]);
 
         if (is_array($var)) return $rs['data'];
@@ -1180,7 +1180,7 @@ if (!function_exists('get_top_customer_org')) {
 if (!function_exists('get_company_item_user_by_name')) {
     function get_company_item_user_by_name(string $company_name = '')
     {
-        $userCommon = new \app\admin\common\User();
+        $userCommon =CommonUser::getIns();
         $rs = $userCommon->handle('get_company_item_user_by_name', ['company_name' => $company_name]);
         return $rs['data'] ?? [];
 
@@ -1229,7 +1229,7 @@ if (!function_exists('get_company_item_user_by_name')) {
 if (!function_exists('get_company_name_by_uid')) {
     function get_company_name_by_uid($uid = '', $get_tops = 2)
     {
-        $userCommon = new \app\admin\common\User();
+        $userCommon = CommonUser::getIns();
 
         $rs = $userCommon->handle('get_company_name_by_uid',['uid'=>$uid,'get_tops'=>$get_tops]);
 
@@ -1287,9 +1287,9 @@ if (!function_exists('get_encryption_password')) {
 if (!function_exists('checkHasAccountBySupplierNos')) {
     function checkHasAccountBySupplierNos(array $supplierNo = []): array
     {
-        $userCommon = new \app\admin\common\User();
+        $userCommon = CommonUser::getIns();
         $rs = $userCommon->handle('check_has_account_by_supplierNos', ['supplierNo' => $supplierNo]);
-        unset($userCommon);
+
         return $rs['data'];
 //        return \app\abutment\model\SupplierRelationUser::where('is_del', \app\abutment\model\SupplierUser::$is_del_normal)
 //            ->whereIn('supplierNo', $supplierNo)
@@ -1617,7 +1617,7 @@ if(!function_exists('menuAction')){
 if (!function_exists('get_headquarters_code_and_name')) {
     function get_headquarters_code_and_name(array $code = []): array
     {
-        $userCommon = new \app\admin\common\User();
+        $userCommon = CommonUser::getIns();
         $res = $userCommon->handle('getCodeAndName', ['code' => $code]);
         return $res['data'];
     }