userCommon使用单例

app/admin/controller/Allot.php

@@ -139,7 +139,7 @@ class Allot extends Base
         $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();
 
         $data = [];
         foreach ($list as $value) {
@@ -309,7 +309,7 @@ class Allot extends Base
         if(empty($st)){
             return error_show(1003,"未找到仓库数据");
         }
-		$user = new \app\admin\common\User();
+		$user = \app\admin\common\User::getIns();
         $supplie=$user->handle("getCodeAndName",["code"=>[$stv['companyNo'],$st['companyNo']]]);
 		if($supplie['code']!=0 || empty($supplie['data'])) return error_show(1001,"未找到供应商数据");
 		$vr = ["name"=>$supplie['data'][$stv['companyNo']],"code"=>$stv['companyNo']];
@@ -914,7 +914,7 @@ public function vesio(){
             $brands = Db::name('brand')->whereIn('id', array_column($list, 'brand_id'))->where('is_del', 0)->column('brand_name', 'id');
             $units = Db::name('unit')->whereIn('id', array_column($list, 'good_unit'))->where('is_del', 0)->column('unit', 'id');
 //            $business = Db::name('business')->whereIn('companyNo', array_column($list, 'companyNo'))->where('is_del', 0)->column('company', 'companyNo');
-            $userCommon=new \app\admin\common\User();
+            $userCommon=\app\admin\common\User::getIns();
             $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list, 'supplierNo'),array_column($list, 'companyNo'))]);
 //            $business = $names['data'];
 

app/admin/controller/Base.php

@@ -204,7 +204,7 @@ class Base extends \app\BaseController
 //            $supplier = Db::name("supplier")->where(["code" => $good['supplierNo']])->findOrEmpty();
 //
 //            if (empty($supplier)) throw new \Exception('非库存商品转库存失败');
-            $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'])) throw new \Exception('查不到该供应商的记录');
 				$personid = $supplier_temp['data']['personid']??0;

app/admin/controller/Business.php

@@ -108,7 +108,7 @@ class Business extends Base
             "updatetime" => date("Y-m-d H:i:s")
         ];
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bCreate', $data);
         return json_show($rs['code'], $rs['message'], $rs['data']);
 //           $datainfo = Db::name('business')->insert($data);
@@ -167,7 +167,7 @@ class Business extends Base
 //        $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
 //        if ($company_name !== "") $where[] = ["b.createrid", 'in', get_company_item_user_by_name($company_name)];
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon =\app\admin\common\User::getIns();
         $rs = $userCommon->handle('bGetList', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
 
@@ -210,7 +210,7 @@ class Business extends Base
 
         if ($val->check($param) == false) return json_show(1005, $val->getError());
 		$param['updatetime'] = date("Y-m-d H:i:s");
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bEdit', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
 
@@ -322,7 +322,7 @@ class Business 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' => 1,
@@ -363,7 +363,7 @@ class Business extends Base
 
         if (!$val->check($param)) return json_show(1005, $val->getError());
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 
         $rs = $userCommon->handle('status', [
             'id' => $param['id'],
@@ -381,7 +381,7 @@ class Business extends Base
 
         $param = $this->request->only(['companyNo'], 'post', 'trim');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bInfo', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
 
@@ -414,7 +414,7 @@ class Business extends Base
 //        $list = Db::name('company_type')->where($where)->select();
 //        return app_show(0,"获取成功",$list);
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bTitle', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
     }

app/admin/controller/Check.php

@@ -126,7 +126,7 @@ public function __construct(App $app)
             $wsminfo =Db::name("warehouse_info")->whereIn("wsm_code",array_column($list, 'wsm_code'))->column("name,supplierNo","wsm_code");
             $goodBasic =Db::name("good_basic")->whereIn("spuCode",array_column($list, 'spuCode'))->column("charger","spuCode");
 
-            $userCommon= new \app\admin\common\User();
+            $userCommon= \app\admin\common\User::getIns();
 	        $supplier_temp =$userCommon->handle("getCodeAndName",["code"=>array_merge(array_column($list,
 	        'companyNo'),array_column($list, 'supplierNo'),array_column($wsminfo,"supplierNo"))]);
 	        $supplier=$supplier_temp['data']??[];
@@ -250,7 +250,7 @@ public function __construct(App $app)
             ->order("a.id desc")
             ->select()
             ->toArray();
-             $userCommon= new \app\admin\common\User();
+             $userCommon= \app\admin\common\User::getIns();
 	        $supplier_temp =$userCommon->handle("getCodeAndName",["code"=>array_unique(array_merge(array_column($list,"code"),array_column($list,"companyNo")))]);
 	        $supplier=$supplier_temp['data']??[];
         $data = [];
@@ -310,7 +310,7 @@ public function __construct(App $app)
 	        return error_show(1002,"参数companyNo不能为空");
 	    }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('bInfo', ['companyNo' => $companyNo]);
         if (!isset($tmp['data']) || empty($tmp['data'])) return json_show(1002, '未找到业务公司');
 //	    $company =Db::name("business")->where(['companyNo'=>$companyNo,"is_del"=>0])->find();
@@ -369,7 +369,7 @@ public function __construct(App $app)
 	    if(empty($fo)){
 	        return error_show(1003,"未找到盘点信息");
 	    }
-	    $userCommon = new \app\admin\common\User();
+	    $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('sInfo', ['code' => $fo['code']]);
         $fo['name'] = $tmp['data']['name']??"";
 	    $fi = Db::name('check_item')->where(['check_code'=>$fo['check_code'],'is_del'=>0])->select();
@@ -594,7 +594,7 @@ public function __construct(App $app)
             ->select()
             ->toArray();
         $data = [];
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName', ['code' => array_column($list, "供应商编码")]);
         $supplier = $tmp['data'] ?? [];
 

app/admin/controller/Good.php

@@ -165,7 +165,7 @@ class Good extends Base
             ->where(['id'=>array_column($list,'good_unit')])
             ->column('unit','id');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),
         array_column($list,'supplierNo'))]);
 
@@ -314,7 +314,7 @@ class Good extends Base
             ->where(['id'=>array_column($list,'platform_code')])
             ->column('platform_name','id');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),array_column($list,'supplierNo'))]);
 
 
@@ -404,7 +404,7 @@ class Good extends Base
         $data['cat_info'] = made($data['cat_id'],[]);
         $spec = Db::name("good_spec")->where(["spuCode"=>$good_platform['spuCode'],"is_del"=>0])->select()->toArray();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>[$data['supplierNo'],$data['companyNo']]]);
 
         $supplier = $userCommon->handle('sInfo',['code'=>$data['supplierNo']]);
@@ -627,7 +627,7 @@ class Good extends Base
         $list = Db::name("good_stock")->where($condition)->page($page,$size)->order("addtime desc")->select();
         $data=[];
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 
         foreach ($list as $key=>$value){
             $temp=[];
@@ -763,7 +763,7 @@ class Good extends Base
             ->column("a.name as wsm_name,wsm_code,a.supplierNo,a.supplierName,a.companyNo,a.companyName",'a.wsm_code');
 //            ->find();
 
-//        $userCommon = new \app\admin\common\User();
+//        $userCommon = \app\admin\common\User::getIns();
 //        $names = $userCommon->handle('getCodeAndName', ['code'=>array_unique(array_merge(array_column($warehouse_info, 'supplierNo'), array_column($warehouse_info, 'companyNo')))]);
 
 
@@ -942,7 +942,7 @@ class Good extends Base
             $good_unit_s = Db::name("unit")->whereIn('id', array_column($list, 'good_unit'))->where('is_del', 0)->column('unit', 'id');
             $brands = Db::name("brand")->whereIn('id', array_column($list, 'brand_id'))->where('is_del', 0)->column('brand_name', 'id');
 
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
             foreach ($list as $key => $value) {
                 $temp = [];
                 if ($value['spuCode'] != "") {
@@ -1173,7 +1173,7 @@ class Good extends Base
 //            }
 //        }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 		$wsmcode = Db::name("warehouse_info")
                 ->alias("a")
                 ->where(['a.wsm_code'=>array_column($list,"wsm_code"),"a.is_del"=>0])
@@ -1281,7 +1281,7 @@ class Good extends Base
             ->whereIn('id',array_column($list,'good_unit'))
             ->column('unit','id');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon =\app\admin\common\User::getIns();
 
         $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'companyNo'))]);
 
@@ -1386,7 +1386,7 @@ class Good extends Base
             ->whereIn('id', array_column($list, 'brand_id'))
             ->column('brand_name', 'id');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $temp = $userCommon->handle('sGetList',['more_code'=>array_column($list,'supplierNo')]);
         $person = array_column($temp['data']['list'],'person','code');
 //        $names = $userCommon->handle('getCodeAndName', ['code' => array_column($list, 'companyNo')]);

app/admin/controller/GoodOfflineLog.php

@@ -55,7 +55,7 @@ class GoodOfflineLog extends Base
 //            })
             ->select()
             ->toArray();
-        $userCommon=new \app\admin\common\User();
+        $userCommon=\app\admin\common\User::getIns();
 		 $supplierInfo = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),array_column($list,'supplierNo'))]);
 		 foreach ($list as &$value){
 		 	$value['companyName'] = $supplierInfo["data"][$value['companyNo']]??"";

app/admin/controller/Goodup.php

@@ -56,7 +56,7 @@ class Goodup extends Base
             $condit[]=['a.companyNo',"like","%$companyNo%"];
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
         if($supplierNo!==""){
@@ -278,7 +278,7 @@ class Goodup extends Base
             $condit[] = ['a.companyNo', "like", "%$companyNo%"];
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo !== "") {
@@ -503,7 +503,7 @@ class Goodup extends Base
         if($supplierNo==''){
             return error_show(1004,"参数supplierNo不能为空");
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
         $supplier_temp =$userCommon->handle("hqInfo",["code"=>$supplierNo]);
         if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
 		$supplierArr=$supplier_temp['data']??[];
@@ -886,7 +886,7 @@ class Goodup extends Base
         if($supplierNo==''){
             return error_show(1004,"参数supplierNo不能为空");
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("hqInfo",["code"=>$supplierNo]);
         if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
 		$supplierArr=$supplier_temp['data']??[];
@@ -1391,7 +1391,7 @@ class Goodup extends Base
         $data['cat_info'] = made($data['cat_id'],[]);
         $spec = Db::name("good_spec")->where(["spuCode"=>$supcode,"is_del"=>0])->select()->toArray();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $sinfo = $userCommon->handle('sInfo',['code'=>$data['supplierNo']]);
 //        $names = $userCommon->handle('getCodeAndName', ['code' => [$data['supplierNo'], $data['companyNo']]]);
 
@@ -2333,7 +2333,7 @@ class Goodup extends Base
             if (isset($supplier_account[$supplierNo])) return json_show(1004, '该供应商已开通账号，不允许操作');
         }
 
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
         $supplier_temp =$userCommon->handle("hqInfo",["code"=>$supplierNo]);
         if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
 		$supplierArr=$supplier_temp['data']??[];

app/admin/controller/Listcustomer.php

@@ -21,7 +21,7 @@ class Listcustomer extends Base
             'itemid'=>'',
         ],'post','trim');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('cTitle', $param);
 
         return json_show($rs['code'], $rs['message'],$rs['data']);

app/admin/controller/Orderback.php

@@ -138,7 +138,7 @@ class Orderback extends Base
             ->where(["a.wsm_code" => array_column($list, 'return_wsm')])
             ->column("a.name,a.supplierNo", 'a.wsm_code');//b.name,b.code
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_column($all_wsm, 'supplierNo'))]);
 
         foreach ($list as $value) {
@@ -279,7 +279,7 @@ class Orderback extends Base
 //          ->leftJoin('supplier s', 's.code=wi.supplierNo AND s.is_del=0')
             ->column('wi.name,wi.supplierNo', 'wi.wsm_code');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_merge(array_column($warehouse, 'supplierNo')))]);
 
 //        $info['company'] = $names['data'][$orderinfo['supplierNo']] ?? '';

app/admin/controller/Platform.php

@@ -105,7 +105,7 @@ class Platform extends Base
 
             if ($param['is_select_pay_rate'] == 1) {
 
-                $userCommon = new \app\admin\common\User();
+                $userCommon = \app\admin\common\User::getIns();
 
 //                if (!isset($company_names['code']) || $company_names['code'] != 0) throw new Exception($company_names['message']);
 
@@ -370,7 +370,7 @@ class Platform extends Base
 
             if ($param['is_select_pay_rate'] == 1) {
 
-                $userCommon = new \app\admin\common\User();
+                $userCommon = \app\admin\common\User::getIns();
                 $company_names = $userCommon->handle('getCodeAndName', ['code' => array_column($param['pay_list'], 'companyNo')]);
 
                 Db::name('platform_pay_rate')

app/admin/controller/Project.php

@@ -578,7 +578,7 @@ class Project extends Base
         $info['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
         $info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName', ['code' => [$info['khNo'], $info['companyNo']]]);
 //        $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
         $info['khName'] = $tmp['data'][$info['khNo']] ?? '';//isset($khinfo['companyName'])?$khinfo['companyName']:"";
@@ -815,7 +815,7 @@ class Project extends Base
         $info['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
         $info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>$info['khNo']]);
 //        $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
         $info['khName'] = $names['data'][$info['khNo']]??'';//isset($khinfo['companyName'])?$khinfo['companyName']:"";

app/admin/controller/Reorder.php

@@ -52,7 +52,7 @@ class Reorder extends Base
             return error_show(1005,"未找到商品数据");
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('sInfo', ['code' => $goon['supplierNo']]);
         if (!isset($tmp['code']) || $tmp['code'] != 0) return json_show($tmp['code'], $tmp['message'], $tmp['data']);
         $supplier = $tmp['data'];
@@ -531,7 +531,7 @@ class Reorder extends Base
 
         $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();
 //        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'customer_code'))]);
 
         $data=[];
@@ -594,7 +594,7 @@ class Reorder extends Base
        $info['post_fee'] = isset($orderinfo['post_fee'])?$orderinfo['post_fee']:'0';
 //       $info['customer_code'] = isset($orderinfo['customer_code'])?$orderinfo['customer_code']:'';
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         if($info['return_wsm']!=""){
             $wsmcode = Db::name("warehouse_info")
                 ->alias("a")
@@ -660,7 +660,7 @@ class Reorder extends Base
             ->where(["wsm_code" => $all_wsm_code])
             ->column("name,supplierNo", 'wsm_code');
 
-        if (!isset($userCommon)) $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $all_supplier_name = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_column($all_wsmcode_info, 'supplierNo'))]);
         $wsm=[];
         if(!empty($wsm_return)){
@@ -699,7 +699,7 @@ class Reorder extends Base
         $addrinfo=[];
         if(!empty($addr)){
 
-            if(!isset($userCommon)) $userCommon=new \app\admin\common\User();
+            $userCommon=\app\admin\common\User::getIns();
             $customer_name = $userCommon->handle('getCodeAndName',['code'=>array_column($addr,'customer_code')]);
 
             foreach ( $addr as $value){
@@ -865,7 +865,7 @@ class Reorder extends Base
 
             $date = date("Y-m-d H:i:s");
 
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
 
             $temp = $info['status'];
             $info['status'] = $status;
@@ -1349,7 +1349,7 @@ class Reorder extends Base
                 ->where(['spuCode' => $order['good_code']])->findOrEmpty();
         if(empty($goon)) return json_show(1004,'该商品不存在');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>[$order['supplierNo'],$order['customer_code'],$goon['supplierNo']]]);
 
         $returnCode=makeNo("RS");
@@ -1462,7 +1462,7 @@ class Reorder extends Base
 //        if($supplier==false){
 //            return error_show(1005,"未找到商品供应商数据");
 //        }
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('sInfo', ['code' => $goon['supplierNo']]);
         if (!isset($tmp['code']) || $tmp['code'] != 0) return json_show($tmp['code'], $tmp['message'], $tmp['data']);
         $supplier = $tmp['data'];
@@ -1493,7 +1493,7 @@ class Reorder extends Base
         	return error_show(1005, '采购单已发起入库');
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName',['code'=>[$order['supplierNo'],$order['customer_code']]]);
 
 

app/admin/controller/Role.php

@@ -54,7 +54,7 @@ class Role extends Base
             ->page($page, $size)
             ->select()
             ->toArray();
-        $userComon=new \app\admin\common\User();
+        $userComon=\app\admin\common\User::getIns();
         $supplier =$userComon->handle("getCodeAndName",["code"=>array_column($list,"companyNo")]);
         $supplierArr=$supplier['data']??[];
         foreach ($list as &$value){

app/admin/controller/Sale.php

@@ -37,7 +37,7 @@ class Sale extends Base
             return error_show(1002, "客户customer_code不能为空");
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
-		$userCommon = new \app\admin\common\User();
+		$userCommon = \app\admin\common\User::getIns();
 		$tmp = $userCommon->handle('getCodeAndName',['code'=>[$customer_code,$supplierNo]]);
         if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
         if(!isset($tmp['data'][$customer_code])) return json_show(1004, "未找到客户数据");
@@ -640,7 +640,7 @@ class Sale extends Base
         if ($addrlist == "" || empty($addrlist) || !is_array($addrlist)) {
             return error_show(1004, "参数addrlist不能为空");
         }
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
         Db::startTrans();
         try {
         	$GoodModel=Db::name("good");
@@ -876,7 +876,7 @@ class Sale extends Base
             return error_show(1003, "参数 companyNo 不能为空");
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 //        }
         $remark = isset($this->post['remark']) && $this->post['remark'] != "" ? trim($this->post['remark']) : "";
 
@@ -1261,7 +1261,7 @@ class Sale extends Base
         if ($planinfo == "") {
             return error_show(1002, "参数planinfo不能为空");
         }
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' =>[$project['companyNo'],$project['khNo']]]);
 		if($names['code']!=0 || empty($names['data']) ) return error_show($names['code'],$names['message']);
         $rm = $this->uid;//isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
@@ -1435,7 +1435,7 @@ class Sale extends Base
            throw new Exception("咨询商品未找到");
         }
         $orderCode = makeNo("QR");
-        $userCommon= new \app\admin\common\User();
+        $userCommon= \app\admin\common\User::getIns();
 		$supplier_temp =$userCommon->handle("sInfo",["code"=>$goodinfo['supplierNo']]);
 		if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception("采购单供应商不存在");
 		$holder_id=$supplier_temp['data']['personid']??0;
@@ -1770,7 +1770,7 @@ class Sale extends Base
         }
 
         $orderCode = makeNo("QR");
-		$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']) )  throw new Exception("供应商不存在");
 		$supplier_temp_info = $supplier_temp['data'];
@@ -2109,7 +2109,7 @@ class Sale extends Base
         $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();
         $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'customer_code'),array_column($list,'supplierNo'))]);
 
         $data = [];
@@ -2380,7 +2380,7 @@ class Sale extends Base
                 $goon["brand_id"] = "";
             }
 
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
             $names = $userCommon->handle('getCodeAndName',['code'=>[
                 $goon['supplierNo'],
                 $goon['companyNo'],
@@ -3155,7 +3155,7 @@ class Sale extends Base
 
         $data = [];
 
-//        $userCommon = new \app\admin\common\User();
+//        $userCommon = \app\admin\common\User::getIns();
 //        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'customer_code'))]);
 
         foreach ($list as $value) {
@@ -3545,10 +3545,10 @@ class Sale extends Base
 
         $all_createrid = array_column($list, 'apply_id');
         $item = get_company_name_by_uid($all_createrid);
-        $user = new \app\admin\common\User();
+        $user = \app\admin\common\User::getIns();
         $names = $user->handle("getCodeAndName", ["code" => array_merge( array_column($list, "supplierNo"), array_column($list, "wsm_supplierNo"))]);
 
-//        $userCommon = new \app\admin\common\User();
+//        $userCommon = \app\admin\common\User::getIns();
 //        $names = $userCommon->handle('getCodeAndName',['code'=>array_column($list,'customer_code')]);
 
         $data = [];
@@ -3897,7 +3897,7 @@ class Sale extends Base
 //                                ->field('person,personid')
 //                                ->where('code', $cgd['supplierNo'])
 //                                ->findOrEmpty();
-                            $userCommon= new \app\admin\common\User();
+                            $userCommon= \app\admin\common\User::getIns();
 							$supplier_temp =$userCommon->handle("sInfo",["code"=>$cgd['supplierNo']]);
 							if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1002,"采购单供应商不存在");
 							$holder_id=$supplier_temp['data']['personid']??0;
@@ -4019,7 +4019,7 @@ class Sale extends Base
                         ->value('supplierNo');
                 }
 
-                $userCommon = new \app\admin\common\User();
+                $userCommon = \app\admin\common\User::getIns();
                 $temp = $userCommon->handle('sInfo', ['code' => $supplierNo]);
 
                 if (($this->level == 2) && ($uid != $temp['data']['personid'])) throw new \think\Exception('非库存品和采返商品只能由供应商负责人操作');
@@ -4479,7 +4479,7 @@ class Sale extends Base
 
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $supplier = $userCommon->handle('sInfo',['code'=>$order['supplierNo']]);
 //        $supplier = Db::name("supplier")->where(["code" => $order['supplierNo']])->find();
         $order['supplier_name'] = isset($supplier['data']['name']) ? $supplier['data']['name'] : "";
@@ -4537,7 +4537,7 @@ class Sale extends Base
             $price = Db::name("gold_price1")->where(["type" => $order['metal_id'], "status" => 1, "is_del" => 0])->order("addtime desc")->find();
 
         }
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $order['supplierNo']]);
 //            $supplier =Db::name("supplier")->where(['code'=>$supplierNo])->find();
 //		 if($supplier_temp['code']!=0 || empty($supplier_temp['data']) )   return error_show(1004,"未找到供应商信息");
@@ -4594,7 +4594,7 @@ class Sale extends Base
             ->leftJoin("purchease_order po", "po.cgdNo=os.cgdNo AND po.is_del=0")
             ->select()
             ->toArray();
-		$userCommon = new \app\admin\common\User();
+		$userCommon = \app\admin\common\User::getIns();
         foreach ($list as &$value) {
 
             if ($value['order_type'] == 3 || $value['order_type'] == 4) {
@@ -4783,7 +4783,7 @@ class Sale extends Base
             ->where(['spuCode' => $spuCodes, 'is_del' => 0])
             ->column('supplierNo','spuCode');
         $supplierNos = array_unique(array_merge($supplierNo1,$supplierNo2));
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $temp = $userCommon->handle('sGetList',['more_code'=>array_values($supplierNos)]);
         $supplier_personid = array_column($temp['data']['list'],'personid','code');
 

app/admin/controller/SaleReport.php

@@ -247,7 +247,7 @@ class SaleReport extends Base
             ->order('ci.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer_tmp = $company_tmp = $customer2_tmp = [];
         foreach ($data as $value) {
             $value['total_fee'] = round($value['budget_price'] * $value['num'], 2);
@@ -304,7 +304,7 @@ class SaleReport extends Base
             ->order('ci.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer_tmp = $company_tmp = $customer2_tmp = [];
         foreach ($data as $value) {
             if (!isset($company_tmp[$value['createrid']])) $company_tmp[$value['createrid']] = $value['createrid'];//get_company_name_by_uid($value['createrid']);//获取创建人的所属部门
@@ -387,7 +387,7 @@ class SaleReport extends Base
             ->order('ci.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer_tmp = $company_tmp = $customer2_tmp = [];
         foreach ($data as $value) {
             $value['total_fee'] = round($value['budget_price'] * $value['num'], 2);
@@ -451,7 +451,7 @@ class SaleReport extends Base
             ->order('ci.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer_tmp = $company_tmp = $customer2_tmp = [];
         foreach ($data as $value) {
             if (!isset($company_tmp[$value['createrid']])) $company_tmp[$value['createrid']] = $value['createrid'];//get_company_name_by_uid($value['createrid']);//获取创建人的所属部门
@@ -521,7 +521,7 @@ class SaleReport extends Base
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $cat_tmp = $customer2_tmp = $company_tmp = [];
         foreach ($data as $value) {
 
@@ -580,7 +580,7 @@ class SaleReport extends Base
             ->where($where)
             ->order('s.addtime', 'desc')
             ->cursor();
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $tmp_customer = $tmp_item = $cat_tmp = $customer2_tmp = [];
         foreach ($data as $value) {
 
@@ -678,7 +678,7 @@ class SaleReport extends Base
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = $company_tmp = [];
         foreach ($data as $value) {
 
@@ -749,7 +749,7 @@ class SaleReport extends Base
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = $company_tmp = [];
         foreach ($data as $value) {
 
@@ -828,7 +828,7 @@ class SaleReport extends Base
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = $uid_tmp = [];
         foreach ($data as $value) {
 
@@ -931,7 +931,7 @@ class SaleReport extends Base
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $customer2_tmp = $uid_tmp = [];
         foreach ($data as $value) {
 
@@ -1000,7 +1000,7 @@ class SaleReport extends Base
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = $company_tmp = [];
 
         foreach ($data as $value) {
@@ -1065,7 +1065,7 @@ class SaleReport extends Base
             ->order('s.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = $company_tmp = [];
 
         foreach ($data as $value) {
@@ -1143,7 +1143,7 @@ class SaleReport extends Base
             ->order('total_num', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = [];
 
         foreach ($data as $value) {
@@ -1192,7 +1192,7 @@ class SaleReport extends Base
             ->order('total_num', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = [];
 
         foreach ($data as $value) {
@@ -1271,7 +1271,7 @@ class SaleReport extends Base
             ->order('ci.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = [];
 
         foreach ($data as $value) {
@@ -1332,7 +1332,7 @@ class SaleReport extends Base
             ->order('ci.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = [];
 
         foreach ($data as $value) {
@@ -1426,7 +1426,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => array_values($codes)]);
 
         $all_company = get_company_name_by_uid(array_values($uid_tmp));
@@ -1489,7 +1489,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => array_values($codes)]);
         $all_company = get_company_name_by_uid(array_values($uid_tmp));
         foreach ($list as &$val) {
@@ -1580,7 +1580,7 @@ class SaleReport extends Base
         $all_uids = array_unique(array_merge(array_column($all_order_return, 'apply_id'), array_column($all_order_back, 'apply_id')));
         $all_company = get_company_name_by_uid($all_uids);
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => array_column($data, 'customer_code')]);
         foreach ($data as $value) {
             if ($value['th_type'] == 2) {
@@ -1669,7 +1669,7 @@ class SaleReport extends Base
             ->column('ob.id,ob.outCode 发货申请单编码,ob.status 退货单状态,ob.apply_id,ob.apply_name 创建人,"" 部门,oa.contactor 发货单联系人,oa.mobile 发货单联系人电话,oa.addr 发货单地址,ri.result 退货原因,oa.addr_code', 'thNo');
 
         $list = [];
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => array_column($data, 'customer_code')]);
 
         $all_uids = array_unique(array_merge(array_column($all_order_return, 'apply_id'), array_column($all_order_back, 'apply_id')));
@@ -1743,7 +1743,7 @@ class SaleReport extends Base
             ->order('or.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = $uid_tmp = [];
 
         foreach ($data as $value) {
@@ -1807,7 +1807,7 @@ class SaleReport extends Base
             ->order('or.addtime', 'desc')
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $customer2_tmp = $uid_tmp = [];
 
         foreach ($data as $value) {
@@ -1903,7 +1903,7 @@ class SaleReport extends Base
         }
 
         //补充客户名称
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => $codes]);
         $all_company = get_company_name_by_uid(array_values($uid_tmp));
         foreach ($list as &$val) {
@@ -1957,7 +1957,7 @@ class SaleReport extends Base
         }
 
         //补充客户名称
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => $codes]);
         $all_company = get_company_name_by_uid(array_values($uid_tmp));
         foreach ($list as &$val) {
@@ -2020,7 +2020,7 @@ class SaleReport extends Base
 
         $list = $tmp_apply = $tmp_cat = $tmp_person = $tmp_codes = [];
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         foreach ($data as $value) {
             if (!isset($tmp_apply[$value['apply_id']])) $tmp_apply[$value['apply_id']] = $value['apply_id'];// get_company_name_by_uid($value['apply_id']);
 //            $value['apply_company'] = $tmp_apply[$value['apply_id']];
@@ -2103,7 +2103,7 @@ class SaleReport extends Base
             ->order("a.addtime desc")
             ->cursor();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $list = $tmp_apply = $tmp_cat = $tmp_person = $tmp_codes = [];
         foreach ($data as $value) {
 

app/admin/controller/Suppler.php

@@ -202,7 +202,7 @@ class Suppler extends Base
 //                $vp = Db::name('supplier_contact')->insert($temp);
 
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('sCreate', ['data' => $data, 'contact' => $temp]);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -228,7 +228,7 @@ class Suppler extends Base
     {
         $param = $this->request->only(['page' => 1, 'size' => 10, 'name' => '', 'creater' => '', 'person' => '', 'status' => '', 'ocr_status' => '', 'start' => '', 'end' => '', 'company_name' => ''], 'post', 'trim');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('sGetList', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -326,7 +326,7 @@ class Suppler extends Base
 //        $info = Db::name("supplier")->where(['id' => $id, 'is_del' => 0])->find();
 
         $code = $this->request->only(['code' => ''], 'post', 'trim');
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $info = $userCommon->handle('sInfo', $code);
 
         if (!isset($info['code']) || $info['code'] != 0) return json_show($info['code'], $info['message']);
@@ -527,7 +527,7 @@ class Suppler extends Base
     public function info()
     {
         $code = $this->request->only(['code' => ''], 'post', 'trim');
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('sInfo', $code);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -555,7 +555,7 @@ class Suppler 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' => 3,
@@ -629,7 +629,7 @@ class Suppler extends Base
 
         if (!$val->check($param)) return json_show(1005, $val->getError());
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 
         $rs = $userCommon->handle('status', [
             'id' => $param['id'],
@@ -703,7 +703,7 @@ class Suppler extends Base
 
         $param = $this->request->filter('trim')->post();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 
         $param['uid']=$this->uid;
         $param['uname']=$this->uname;

app/admin/controller/Supplier.php

@@ -203,7 +203,7 @@ public function selec(){
     {
         $post = $this->request->only(['companyNo' => '', 'name' => '', 'type' => '', 'page' => 1, 'size' => 10], 'post', 'trim');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('hqList', [
             'code' => $post['companyNo'],
             'name'=>$post['name'],

app/admin/controller/User.php

@@ -23,7 +23,7 @@ class User extends Base
 
         if (!$val->check($param)) return json_show(1004, $val->getError());
 
-        $user = new CommonUser();
+        $user = CommonUser::getIns();
         $rs = $user->login(array_merge($param, ['plat_code' => 'cx']));
 
         $rs = json_decode($rs, true);
@@ -112,7 +112,7 @@ class User extends Base
         $param = $this->request->only(['nickname' => '', 'username' => '', 'status' => '', 'page' => 1, 'size' => 10, 'uid' => '', 'nuid' => '', 'companyNo' => ''], 'post', 'trim');
 
         $param['level'] = 1;//只筛选超管用户
-        $userCommon = new CommonUser();
+        $userCommon = CommonUser::getIns();
         $rs = $userCommon->GetUserlist($param);
 
         $rs = json_decode($rs, true);
@@ -132,7 +132,7 @@ class User extends Base
 
         if (in_array($this->uid, $param['ids'])) return json_show(1004, '自己不能删除自己');
 
-        $userCommon = new CommonUser();
+        $userCommon = CommonUser::getIns();
         $rs = $userCommon->userDelete($param);
 
         $rs = json_decode($rs, true);
@@ -214,7 +214,7 @@ class User extends Base
 
 //        $id = $this->request->post('id/d', 0, "trim");
 
-        $userCommon = new CommonUser();
+        $userCommon = CommonUser::getIns();
         $rs = json_decode($userCommon->GetUserInfo(['id' => $this->uid]), true);
 
         $rs['data']['level'] = $this->level;
@@ -279,7 +279,7 @@ class User extends Base
 //        }
 
         $post['level'] = 2;
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $userlist = $userCommon->handle('userall', $post);
 //        if (!isset($userlist['code']) || $userlist['code'] != 0)
         return json_show($userlist['code'], $userlist['message'], $userlist['data']);
@@ -426,7 +426,7 @@ class User extends Base
 //        }
 //    	var_dump($post);
 //        $userinfo=GetUserList($post);
-        $userCommon = new CommonUser();
+        $userCommon = CommonUser::getIns();
         $userinfo = $userCommon->GetList($post);
         $userinfo = json_decode($userinfo, true);
         if (empty($userinfo) || $userinfo['code'] != 0) {
@@ -461,7 +461,7 @@ class User extends Base
         $post = $this->request->only(["id", "roleid", 'companyNo'], "post", "trim");
 
         //待修改的账户详情
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $userinfo = $userCommon->handle('userinfo', ['id' => $post['id']]);
         if (!isset($userinfo['code']) || $userinfo['code'] != 0) return json_show($userinfo['code'], $userinfo['message'], $userinfo['data']);
 
@@ -549,7 +549,7 @@ class User extends Base
 
 //                $companyinfo = ["id" => $post['id'], "company" => $companyarr, "token" => $post['token']];
 
-//                $userCommon = new \app\admin\common\User();
+//                $userCommon = \app\admin\common\User::getIns();
 //                $companyset = $userCommon->handle('setcompany', $companyinfo);
 
 //                if (!isset($companyset['code']) || $companyset['code'] != 0) return json_show(1004, $companyset['message']);
@@ -588,7 +588,7 @@ class User extends Base
 //                "token" => $post['token']
 //            ];
 //            $saev = resetinfo($saveinfo);
-//            $userCommon = new \app\admin\common\User();
+//            $userCommon = \app\admin\common\User::getIns();
 //            $saev = $userCommon->handle('usersave', $saveinfo);
 //            if (!isset($saev['code']) || $saev['code'] != 0) {
 //                return json_show(1004, $saev['message']);
@@ -796,7 +796,7 @@ class User extends Base
         ]);
         if ($validate->check($post) == false) return json_show(1004, $validate->getError());
 
-        $userCommon = new CommonUser();
+        $userCommon = CommonUser::getIns();
         $rs = json_decode($userCommon->userSave($post), true);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -838,7 +838,7 @@ class User extends Base
         ]);
         if (!$validate->check($post)) return json_show(1004, $validate->getError());
 
-        $userCommon = new CommonUser();
+        $userCommon = CommonUser::getIns();
         $rs = json_decode($userCommon->resetPasswd($post), true);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -910,7 +910,7 @@ class User extends Base
         ]);
         if (!$validate->check($post)) return json_show(1004, $validate->getError());
 
-        $userCommon = new CommonUser();
+        $userCommon = CommonUser::getIns();
         $rs = json_decode($userCommon->resetState($post), true);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -1012,7 +1012,7 @@ class User extends Base
 //            unset($post["islevel"]);
 //        }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $userinfo = $userCommon->GetAccountall($post);
         $userinfo = json_decode($userinfo, true);
         if (empty($userinfo) || $userinfo['code'] != 0) return app_show($userinfo['code'], $userinfo['msg']);
@@ -1053,7 +1053,7 @@ class User extends Base
 
         $param['uid'] = $this->uid;
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('passSetByPassword', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);

app/admin/controller/Version.php

@@ -72,7 +72,7 @@ class Version extends BaseController
         $info['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
         $info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName', ['code' => [$info['companyNo'], $info['khNo']]]);
         $info['khName'] = $tmp['data'][$info['khNo']] ?? '';
         $info['company'] = $tmp['data'][$info['companyNo']] ?? '';
@@ -229,7 +229,7 @@ class Version extends BaseController
         $info['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
         $info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => $info['khNo']]);
 //        $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
         $info['khName'] = $names['data'][$info['khNo']] ?? '';//isset($khinfo['companyName'])?$khinfo['companyName']:"";