|
@@ -14,11 +14,11 @@ use Illuminate\Support\Facades\DB;
|
|
|
class U8XkyServerService extends Service
|
|
class U8XkyServerService extends Service
|
|
|
{
|
|
{
|
|
|
public function recordCommon($data, $user, $field = []){
|
|
public function recordCommon($data, $user, $field = []){
|
|
|
- $state = $data['state'] ?? null;
|
|
|
|
|
|
|
+ $state = $data['state'] ?? [];
|
|
|
$qx = $user['qx'];
|
|
$qx = $user['qx'];
|
|
|
$model = U8State::where('del_time',0)
|
|
$model = U8State::where('del_time',0)
|
|
|
->when(! empty($state), function ($query) use($state){
|
|
->when(! empty($state), function ($query) use($state){
|
|
|
- return $query->where('state', $state);
|
|
|
|
|
|
|
+ return $query->whereIn('state', $state);
|
|
|
})
|
|
})
|
|
|
->when(empty($qx), function ($query) use($qx, $user){
|
|
->when(empty($qx), function ($query) use($qx, $user){
|
|
|
return $query->where('userid', $user['userid']);
|
|
return $query->where('userid', $user['userid']);
|