|
|
@@ -2040,7 +2040,7 @@ class User extends BaseController
|
|
2040
|
2040
|
->join('user u', 'r.uid = u.uid', 'LEFT')
|
|
2041
|
2041
|
->field('r.operation_id,r.old_identity_id,r.new_identity_id,r.mark,r.create_time,u.nickname,u.account');
|
|
2042
|
2042
|
if($uid){
|
|
2043
|
|
- $records->where('uid', $uid);
|
|
|
2043
|
+ $records->where('r.uid', $uid);
|
|
2044
|
2044
|
}
|
|
2045
|
2045
|
$query=$records
|
|
2046
|
2046
|
->order('create_time DESC')
|
|
|
@@ -2055,7 +2055,7 @@ class User extends BaseController
|
|
2055
|
2055
|
->alias('r')
|
|
2056
|
2056
|
->join('user u', 'u.uid = r.old_spread_id', 'LEFT')
|
|
2057
|
2057
|
->join('user ua', 'ua.uid = r.new_spread_id', 'LEFT')
|
|
2058
|
|
- ->field('r.operation_id,r.uid,u,account as old_account,ua.account as new_account,r.mark, r.create_time');
|
|
|
2058
|
+ ->field('r.operation_id,r.uid,u.account as old_account,ua.account as new_account,r.mark, r.create_time');
|
|
2059
|
2059
|
|
|
2060
|
2060
|
if ($uid) {
|
|
2061
|
2061
|
$records->where('r.uid', $uid);
|