|
|
@@ -211,7 +211,7 @@ class U8XkyServerService extends Service
|
|
|
})
|
|
|
->where('i.del_time', 0)
|
|
|
->where('i.login_type', $user['login_type'])
|
|
|
- ->select('i.*', DB::raw('IFNULL(s.state, -1) as state'))
|
|
|
+ ->select('i.*', DB::raw('IFNULL(s.state, -1) as state'),'s.result')
|
|
|
->orderby('i.id', 'desc');
|
|
|
|
|
|
// 2. 状态过滤逻辑
|
|
|
@@ -439,7 +439,7 @@ class U8XkyServerService extends Service
|
|
|
})
|
|
|
->where('v.del_time', 0)
|
|
|
// ->where('v.crt_id', $user['userid'])
|
|
|
- ->select('v.*', DB::raw('IFNULL(s.state, -1) as state'))
|
|
|
+ ->select('v.*', DB::raw('IFNULL(s.state, -1) as state'),'s.result')
|
|
|
->orderby('v.id', 'desc');
|
|
|
|
|
|
if (isset($data['state']) && $data['state'] !== '') {
|