供应商升级时为业务公司时，重新给业务公司赋GS编码

app/common.php

@@ -132,4 +132,16 @@ if (!function_exists('crea')) {
         }
         return $data;
     }
+}
+
+
+//生成随机字符串
+if (function_exists('makeNo') == false) {
+    function makeNo(string $str = '')
+    {
+        $date = date("ymdHis");
+//        $year = date("Y")-2000;
+        $msec = rand(1000, 9999);
+        return $str . $date . $msec;
+    }
 }

app/controller/Headquarters.php

@@ -36,7 +36,7 @@ class Headquarters extends BaseController
             ->count('id');
 
         $list = Db::name('headquarters')
-            ->field('id,code,name,type,status,addtime')
+            ->field('id,code,name,type,status,addtime,relation_code')
             ->where($condition)
             ->page($post['page'], $post['size'])
             ->order(['addtime' => 'desc', 'id' => 'desc'])
@@ -760,11 +760,13 @@ class Headquarters extends BaseController
 
             $date = date('Y-m-d H:i:s');
 
+            $business_code = makeNo('GS');
+
             //原业务公司列表
             Db::name('business')
                 ->insert([
                     'company' => $res['name'],
-                    'companyNo' => $res['code'],
+                    'companyNo' =>$business_code,
                     'inv_code' => $res['registercode'],
                     'company_type' => $res['nature'],
                     'type' => $temp['id'] ?? 0,
@@ -799,6 +801,7 @@ class Headquarters extends BaseController
                     'updater' => $post['uname'],
                     'updaterid' => $post['uid'],
                     'updatetime' => $date,
+                    'relation_code'=>$business_code
                 ]);
 
             //供应商

app/controller/UserInfo.php

@@ -47,12 +47,15 @@ class UserInfo extends BaseController
         }
         $page = isset($post['page']) && $post['page'] !== "" ? intval($post['page']) : 1;
         $size = isset($post['size']) && $post['size'] !== "" ? intval($post['size']) : 10;
-        $count = Db::name("account")->alias("a")
+        $count = Db::name("account")
+            ->alias("a")
             ->leftJoin("user b", "a.id=b.account_id and b.status=1")
-            ->where($condition)->count();
+            ->where($condition)
+            ->count('a.id');
         $total = intval(ceil($count / $size));
         $page = $total >= $page ? $page : $total;
-        $list = Db::name("account")->alias("a")
+        $list = Db::name("account")
+            ->alias("a")
             ->leftJoin("user b", "a.id=b.account_id and b.status=1")
             ->append(['plat', 'company_relaton'])
 //            ->withAttr('plat', function ($val, $da) {
@@ -72,7 +75,7 @@ class UserInfo extends BaseController
                     ->toArray();
             })
             ->where($condition)->page($page, $size)->order("a.id desc")
-            ->field("a.id,a.username,a.mobile,a.source,a.status,b.nickname,b.sex,b.email,a.addtime,a.updatetime")
+            ->field("a.id,a.username,a.mobile,a.source,a.status,b.nickname,b.sex,b.email,a.addtime,a.updatetime,a.level")
             ->select()->toArray();
 
         return json_show(0, "获取成功", ["list" => $list, "count" => $count]);