|
|
@ -217,8 +217,12 @@ class ServerOrder extends Order |
|
|
|
// 当前用户ID |
|
|
|
// 当前用户ID |
|
|
|
$userId = UserService::getCurrentLoginUserId(); |
|
|
|
$userId = UserService::getCurrentLoginUserId(); |
|
|
|
// 查询数据 |
|
|
|
// 查询数据 |
|
|
|
return $this->where('user_id', '=', $userId) |
|
|
|
$query = $this; |
|
|
|
->where($dataTypeFilter) |
|
|
|
// 非店长不带入user_id查询 |
|
|
|
|
|
|
|
if (!UserService::isStore()) { |
|
|
|
|
|
|
|
$query->where('user_id', '=', $userId); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return $query->where($dataTypeFilter) |
|
|
|
->where('is_delete', '=', 0) |
|
|
|
->where('is_delete', '=', 0) |
|
|
|
->count(); |
|
|
|
->count(); |
|
|
|
} |
|
|
|
} |
|
|
|