Compare commits
2 Commits
20250806-1
...
20250806-2
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a962ecb39 | |||
| 24a911d63a |
@@ -91,6 +91,6 @@ class UserSite extends Model
|
|||||||
*/
|
*/
|
||||||
public function getUserDefaultInfoByUserId(int $userId)
|
public function getUserDefaultInfoByUserId(int $userId)
|
||||||
{
|
{
|
||||||
return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_NO_DEFAULT)->first();
|
return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_DEFAULT)->first();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ class FinancesService extends BaseService
|
|||||||
->when($searchKitchenId, function ($query) use ($searchKitchenId) {
|
->when($searchKitchenId, function ($query) use ($searchKitchenId) {
|
||||||
$query->where('kitchen_id', $searchKitchenId);
|
$query->where('kitchen_id', $searchKitchenId);
|
||||||
})
|
})
|
||||||
->groupBy('cycle_id')
|
->groupBy('cycle_id','date')
|
||||||
->orderByDesc('cycle_id')
|
->orderByDesc('cycle_id')
|
||||||
->select(
|
->select(
|
||||||
'date',
|
'date',
|
||||||
|
|||||||
Reference in New Issue
Block a user