From 0a13418fd4647a4517954cd46e54484745eaac01 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 6 Dec 2020 22:54:44 +0800
Subject: [PATCH] 333333

---
 hyhproject/common/model/Users.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hyhproject/common/model/Users.php b/hyhproject/common/model/Users.php
index fd46d27..85ae6a3 100755
--- a/hyhproject/common/model/Users.php
+++ b/hyhproject/common/model/Users.php
@@ -104,14 +104,14 @@ class Users extends Base{
                 ->join('user_trees t','u.userId=t.uid')
                 ->join('user_lock l','u.userId=l.userId')
                 ->where(['t.pid'=>$userId,'u.userStatus'=>0,'u.userLevel'=>$userLevel])
-                ->field('u.userId,u.loginName as trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime')
+                ->field('u.userId as id, u.loginName as userId,u.loginName as trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime')
                 ->order('l.id DESC,u.userId DESC')
                 ->paginate(input('pageSize/d'))->toArray();
         }else{
             $rs = Db::name('users u')
                 ->join('user_trees t','u.userId=t.uid')
                 ->where(['t.pid'=>$userId,'u.userStatus'=>1,'u.userLevel'=>$userLevel])
-                ->field('u.userId,u.trueName,u.userPhone,u.userLevel,u.createTime')
+                ->field('u.userId as id, u.loginName as userId,u.trueName,u.userPhone,u.userLevel,u.createTime')
                 ->order('u.userId DESC')
                 ->paginate(input('pageSize/d'))->toArray();
         }