|
@@ -2,8 +2,10 @@
|
|
|
|
|
|
namespace app\data\service;
|
|
|
|
|
|
+use app\data\model\DataPoolTalent;
|
|
|
use app\data\model\DataUser;
|
|
|
use app\data\model\DataUserToken;
|
|
|
+use app\data\model\DataZhicheng;
|
|
|
use think\admin\Exception;
|
|
|
use think\admin\Service;
|
|
|
|
|
@@ -88,6 +90,9 @@ class UserAdminService extends Service
|
|
|
->with(['pooltalent','maintenance','shipyard','merchants'])
|
|
|
->findOrEmpty();
|
|
|
if ($user->isEmpty()) throw new Exception('用户还没有注册!');
|
|
|
+ if ($user['pooltalent']){
|
|
|
+ $user['pooltalent']['zcname'] = DataZhicheng::mk()->where('id',$user['pooltalent']['zc_id'])->value('name');
|
|
|
+ }
|
|
|
// 用户认证令牌处理
|
|
|
$map = ['uuid' => $uuid, 'type' => $type];
|
|
|
if (!($access = DataUserToken::mk()->where($map)->find())) {
|