登录接口优化

app/admin/controller/User.php

@@ -27,7 +27,35 @@ class User extends Base
 
         $rs = json_decode($rs, true);
 
-        return json_show($rs['code'], $rs['message'], $rs['data'] ?? []);
+        if(!isset($rs['code'])|| $rs['code']!=0)  return json_show(1004,$rs['message']);
+
+        $role =Db::name('user_role')
+            ->where(['uid'=>$rs['data']['id'],'is_main'=>1,'is_del'=>0])
+            ->findOrEmpty();
+
+        if(empty($role)) return json_show(1004,'未开通登录权限');
+
+        $company_name = Db::name('supplier')
+            ->where(['code' => $role['companyNo']])
+            ->value('name', '');
+
+        $roleinfo = Db::name('role')
+            ->where(['id' => $role['roleid']])
+            ->field('role_name,level')
+            ->find();
+
+        //数据合并
+        $data = array_merge($rs['data'], [
+            'role_name' => $roleinfo['role_name'] ?? '',
+            'company_name' => $company_name ?? '',
+            'role_level' => $roleinfo['level'] ?? '',
+            'role_id' => $role['roleid'] ?? '',
+            'companyNo' => $role['companyNo'] ?? '',
+            'company_type' => $role['company_type'] ?? '',
+        ]);
+
+        return json_show(0,'登录成功',$data);
+
     }
 
     //列表