16

2026-03-01 21:05:19 +08:00
parent 0a45a8fbb9
commit 92948fa856
39 changed files with 594 additions and 269 deletions
@@ -120,7 +120,7 @@ class TeamController extends BaseController{
            ->join('user_extend ue', 'u.id = ue.user_id')
            ->where('u.parent_id', $user['id'])
            //->where('ue.active', 1)
-            ->field('u.id, u.username,u.money,u.score,u.role_id, u.group,u.avatar, u.created_at')
+            ->field('u.id,u.userID, u.username,u.money,u.score,u.role_id, u.group,u.avatar, u.created_at')
            ->order('u.created_at desc');
        if($kw){
            $model = $model->whereLike("u.username",'%'.$kw.'%');
@@ -161,7 +161,6 @@ class TeamController extends BaseController{
            $result['data'][$k]['direct_total']      =  cache('team_direct_total_'.$item['id'])??0;
            $result['data'][$k]['role'] = isset($role_arr[$item['role_id']]) ? $role_arr[$item['role_id']] : __('普通用户');
            //$result['data'][$k]['questionnaire_count'] = WorkRecordModel::where('user_id',$item['id'])->count('id');
-        	$result['data'][$k]['id'] = idEncode($item['id']);
            //return $item;
        }
        return $this->success(__('successful'),$result);
@@ -176,7 +175,7 @@ class TeamController extends BaseController{
        $user = \support\Jwt::getUser();
        $id = $request->post('id');
        $level = $request->post('level');
-        $id = idDecode($id);
+        $id = \support\Encrypt::userIDDecode($id);
        if(!$id || !$level){
        	return $this->error(__('Invalid parameters'));
        }