再更换

app/admin/controller/Activity.php

@@ -222,7 +222,7 @@ class Activity extends Base
             ->column('unit','id');
 
         $all_code = array_merge(array_column($list,'supplierNo'),array_column($list,'companyNo'));
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_code]);
 
 //halt($list);

app/admin/controller/After.php

@@ -104,7 +104,7 @@ class After extends Base
             ->findOrEmpty();
         if (empty($error)) return error_show(1005, "未找到退货原因数据");
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $supplier = $userCommon->handle('sInfo', ['code' => $goon['supplierNo']]);
 //        if (!isset($supplier['code']) || $supplier['code'] != 0) return json_show($supplier['code'], $supplier['message'], $supplier['data']);
         $supplier = $supplier['data'];
@@ -320,7 +320,7 @@ class After extends Base
         //获取客户信息
 //        $all_customer_code = array_column($list, 'customer_code');
 
-//        $userCommon = new \app\admin\common\User();
+//        $userCommon = \app\admin\common\User::getIns();
 //        $customer_ = $userCommon->handle('getCodeAndName', ['code' => array_unique(array_merge(array_column($list, 'customer_code'), array_column($list, 'supplierNo')))]);
 
         $data = [];
@@ -406,7 +406,7 @@ class After extends Base
 
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => [
             $wsmcode['supplierNo'] ?? '',
             $wsmcode['companyNo'] ?? '',
@@ -1819,7 +1819,7 @@ class After extends Base
 //                ->field('id,person,personid')
 //                ->where('code',$old_cgd['supplierNo'])
 //                ->findOrEmpty();
-	    $user= new \app\admin\common\User();
+	    $user= \app\admin\common\User::getIns();
         $supplier_temp_info =$user->handle("sInfo",["code"=>$old_cgd['supplierNo']]);
             $data = array_merge($old_sale, [
                 'id' => null,
@@ -2112,7 +2112,7 @@ class After extends Base
     private function createCgd($data,array &$standing_book_da=[]){
         $cgdCode = makeNo("CG");
 //        $supplier=Db::name("supplier")->where(["code"=>$data['supplierNo'],"is_del"=>0])->find();
-        $user= new \app\admin\common\User();
+        $user= \app\admin\common\User::getIns();
         $supplier_temp =$user->handle("sInfo",["code"=>$data['supplierNo']]);
         if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception('该供应商不存在');
 		$supplier=$supplier_temp['data'];
@@ -2402,10 +2402,10 @@ class After extends Base
 //                ->field('id,person,personid')
 //                ->where('code',$cgd['supplierNo'])
 //                ->findOrEmpty();
-         $user= new \app\admin\common\User();
+         $user= \app\admin\common\User::getIns();
         $supplier_temp =$user->handle("sInfo",["code"=>$cgd['supplierNo']]);
         }else{
-        $user= new \app\admin\common\User();
+        $user= \app\admin\common\User::getIns();
         $supplier_temp =$user->handle("sInfo",["code"=>$goodinfo['supplierNo']]);
 //        	 $supplier_temp_info = Db::name('supplier')
 //                ->field('id,person,personid')

app/admin/controller/Customer.php

@@ -21,7 +21,7 @@ class Customer extends Base
 
         $param = $this->request->filter('trim')->post();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('customer_org_list', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -170,7 +170,7 @@ class Customer 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('customer_org_create', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -257,7 +257,7 @@ class Customer 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('customer_org_update', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -329,7 +329,7 @@ class Customer extends Base
             return error_show(1004, "公司客户不存在");
         }
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('customer_org_info', ['id' => $id]);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -346,7 +346,7 @@ class Customer extends Base
 
         if ($id === 0) return json_show(1004, 'id不能为空');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('customer_org_delete', ['id' => $id]);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -376,7 +376,7 @@ class Customer extends Base
 
         $param = $this->request->filter('trim')->post();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('customer_org_status', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);

app/admin/controller/Filing.php

@@ -127,7 +127,7 @@ class Filing extends Base
 //            ->where(['companyNo' => $param['customerCode']])
 //            ->value('company', '');
 //        if ($customerName == '') return json_show(1004, '该业务公司不存在');
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => [$param['customerCode'], $param['supplierNo']]]);
         if (!isset($names['data'][$param['customerCode']]) || $names['data'][$param['customerCode']] == '') return json_show(1004, '该业务公司不存在');
         if (!isset($names['data'][$param['supplierNo']]) || $names['data'][$param['supplierNo']] == '') return json_show(1004, '该供应商不存在');
@@ -232,7 +232,7 @@ class Filing extends Base
             ->findOrEmpty();
         if (empty($rs)) return json_show(1005, '该报备单不存在或不允许审核');
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $company = $userCommon->handle('cInfo', ['companyNo' => $param['companyCode']]);
         if (!isset($company['data'])) return json_show(1005, '该客户不存在');
 //        $companyName = Db::name('customer_info')
@@ -301,7 +301,7 @@ class Filing extends Base
         //level3账号都可以操作
         //level2账号的话，只有供应商负责人能操作
         if ($this->level == 2) {
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
             $supp = $userCommon->handle('sInfo', ['code' => $rs['supplierNo']]);
             if ($this->uid != $supp['data']['personid']) return json_show(1004, '只有供应商负责人才能操作');
         }
@@ -352,7 +352,7 @@ class Filing extends Base
 //            ->field('id,person,personid,name,code')
 //            ->where(['code' => $filing['supplierNo']])
 //            ->findOrEmpty();
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $supplier = $userCommon->handle('sInfo', ['code' => $filing['supplierNo']]);
 
 //        $names = $userCommon->handle('getCodeAndName', ['code' => [$filing['companyCode'], $filing['customerCode'],]]);
@@ -714,7 +714,7 @@ class Filing extends Base
         $qrdcode = makeNo("QR");
         $cgddcode = makeNo("CG");
         $goodCode = makeNo("SKU");
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName',['code'=>[$param['khNo'],$param['supplierNo'],$param['companyNo']]]);
         if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
         if(!isset($tmp['data'][$param['khNo']])) return json_show(1004, "未找到客户数据");
@@ -917,7 +917,7 @@ class Filing extends Base
 		$platform = Db::name("platform")->where(["id" => $saleinfo['platform_id']])->field("platform_name,pay_title")
 		->findOrEmpty();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon =\app\admin\common\User::getIns();
         $names = $userCommon->handle('getCodeAndName', ['code' => [$saleinfo['supplierNo'], $saleinfo['customer_code']]]);
 
         $data = [
@@ -1008,7 +1008,7 @@ class Filing extends Base
             ->findOrEmpty();
         if (empty($cgd)) return error_show(1004, "采购单不存在");
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $tmp = $userCommon->handle('getCodeAndName',['code'=>[$param['supplierNo'],$cgd['companyNo']]]);
         if(!isset($tmp['code']) || $tmp['code']!=0) return json_show($tmp['code'],$tmp['message'],$tmp['data']);
 //        if(!isset($tmp['data'][$param['khNo']])) return json_show(1004, "未找到客户数据");

app/admin/controller/Newfill.php

@@ -41,7 +41,7 @@ class Newfill extends Base
 //        $item = Db::name("depart_user")->where($depart)->select()->toArray();
 //        $list = Db::name("company_item")->where($condition)->select()->toArray();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('ulist', $post);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);//"获取成功", ["depart" => $list, "item" => $item]);
@@ -52,7 +52,7 @@ class Newfill extends Base
     {
 
         $param = $this->request->filter('trim')->post();
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('stat', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -86,7 +86,7 @@ class Newfill extends Base
     public function userp()
     {
         $param = $this->request->filter('trim')->post();
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('userp', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -136,7 +136,7 @@ class Newfill extends Base
     {
         $param = $this->request->filter('trim')->post();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('add', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -211,7 +211,7 @@ class Newfill extends Base
 
         $param = $this->request->filter('trim')->post();
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('refresh', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -277,7 +277,7 @@ class Newfill extends Base
     public function query()
     {
         $param = $this->request->filter('trim')->post();
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('query', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -310,7 +310,7 @@ class Newfill extends Base
     {
 
         $param = $this->request->filter('trim')->post();
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('itemdel', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);

app/admin/controller/OrderImport.php

@@ -562,7 +562,7 @@ class OrderImport extends Base
         $data['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
         $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();
         $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $data['supplierNo']]);
 //        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo']])->find();
         $supplier = $supplier_temp['data']??"";

app/admin/controller/OrderOutChild.php

@@ -353,7 +353,7 @@ class OrderOutChild extends Base
             $date = date('Y-m-d H:i:s');
 
             //所有供应商负责人
-            $userCommon = new \app\admin\common\User();
+            $userCommon = \app\admin\common\User::getIns();
             $person_temp = $userCommon->handle('sGetList', ['more_code' => array_unique(array_column($child, 'supplierNo'))]);
             $person = array_column($person_temp['data']['list'], 'personid', 'code');
             unset($userCommon);

app/admin/controller/Report.php

@@ -135,7 +135,7 @@ class Report extends Base
             ->select()
             ->toArray();
         $supplerArr=array_column($rs_temp_good,"供应商名称");
-         $userCommon = new \app\admin\common\User();
+         $userCommon = \app\admin\common\User::getIns();
          $supplier_temp = $userCommon->handle('getCodeAndName', ['code' => $supplerArr]);
          $supplier=$supplier_temp['data']??[];
         $all_good_type = [0 => '非定制商品', 1 => '定制商品'];

app/admin/controller/SupplierClient.php

@@ -96,7 +96,7 @@ class SupplierClient extends Base {
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
 
-        $userCommon = new \app\admin\common\User();
+        $userCommon = \app\admin\common\User::getIns();
 //        //只有level2的账号过滤数据权限
         if ($this->level == 2) {
             $role = $this->checkDataShare();
@@ -329,7 +329,7 @@ class SupplierClient 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]);
@@ -467,7 +467,7 @@ class SupplierClient 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){
@@ -721,7 +721,7 @@ class SupplierClient 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, "customer_code"), array_column($list, "wsm_supplierNo"))]);
         $data = [];
         foreach ($list as $value) {
@@ -969,7 +969,7 @@ class SupplierClient 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) {

app/admin/controller/UserCompany.php

@@ -15,7 +15,7 @@ class UserCompany extends Base
 
         $param = $this->request->only(['account_id' => '', 'status' => '', 'page' => 1, 'size' => 10], 'post', 'trim');
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
 
         $rs = $userCommon->handle('userCompanyList', $param);
 
@@ -91,7 +91,7 @@ class UserCompany extends Base
                 ->update(['roleid' => $param['roleid'], 'updatetime' => $date]);
         }
 
-//        $userCommon = new UserCommon();
+//        $userCommon = UserCommon::getIns();
 //        $rs = json_decode($userCommon->handle('userCompanyUpdate', $param), true);
 
         return $rs ? json_show(0, '修改成功') : json_show(1004, '修改失败');
@@ -109,7 +109,7 @@ class UserCompany extends Base
 
         if ($val->check($param) == false) return json_show(1004, $val->getError());
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
         $rs = $userCommon->handle('userCompanyStatus', $param);
 
         if (!isset($rs['code']) || $rs['code'] != 0) return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -131,7 +131,7 @@ class UserCompany extends Base
 
         $param = $this->request->post(['id'], 'post', 'trim');
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
 
         $rs = $userCommon->handle('userCompanyInfo', $param);
 
@@ -159,7 +159,7 @@ class UserCompany extends Base
 
         $param['account_id'] = $this->uid;
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
 
         $rs = $userCommon->handle('userCompanyList', $param);
 
@@ -189,7 +189,7 @@ class UserCompany extends Base
 
         $param = $this->request->filter('trim')->post();
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
 
         $rs = $userCommon->handle('changeMain', $param);
 

app/admin/controller/UserCompanyBasic.php

@@ -18,7 +18,7 @@ class UserCompanyBasic extends Base
 
         if ($param['level'] == 1) return json_show(1004, '这里不能查看超管账号');//排除超管账号
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
 
         $rs = $userCommon->handle('userCompanyBasicList', $param);
 
@@ -55,7 +55,7 @@ class UserCompanyBasic extends Base
             }
         }
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
         $rs = $userCommon->handle('userCompanyBasicAdd', $param);
 
         if (!isset($rs['code']) || $rs['code'] != 0) return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -99,7 +99,7 @@ class UserCompanyBasic extends Base
         $val = Validate::rule(['ids|账号ID' => 'require|array|max:100']);
         if (!$val->check($param)) return json_show(1004, $val->getError());
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
         $rs = $userCommon->handle('userCompanyBasicDelete', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -110,7 +110,7 @@ class UserCompanyBasic extends Base
     {
         $param = $this->request->only(['id', 'itemid'], 'post');
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
         $rs = $userCommon->handle('userCompanyBasicUpdate', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -121,7 +121,7 @@ class UserCompanyBasic extends Base
     {
         $param = $this->request->only(['id', 'status'], 'post', 'trim');
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
         $rs = $userCommon->handle('userCompanyBasicStatus', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -132,7 +132,7 @@ class UserCompanyBasic extends Base
     {
         $param = $this->request->only(['id', 'password'], 'post', 'trim');
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
         $rs = $userCommon->handle('setpasswd', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);
@@ -144,7 +144,7 @@ class UserCompanyBasic extends Base
 
         $param = $this->request->only(['id'], 'post', 'trim');
 
-        $userCommon = new UserCommon();
+        $userCommon = UserCommon::getIns();
 
         $rs = $userCommon->handle('userCompanyBasicInfo', $param);