|
|
@@ -392,6 +392,18 @@ class FinanceRepository extends BaseRepository
|
|
392
|
392
|
$weekWhere = " 1=1";
|
|
393
|
393
|
$dayWhere = " 1=1";
|
|
394
|
394
|
|
|
|
395
|
+ // 需要过滤掉的用户
|
|
|
396
|
+ /** @var UserRepository $userRepository */
|
|
|
397
|
+ $userRepository = app()->make(UserRepository::class);
|
|
|
398
|
+ $invalidUidList = $userRepository->getInvalidUidList();
|
|
|
399
|
+ if (!empty($invalidUidList)) {
|
|
|
400
|
+ $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
|
|
|
401
|
+ $where .= $invalidSqlStr;
|
|
|
402
|
+ $sWeekWhere .= $invalidSqlStr;
|
|
|
403
|
+ $weekWhere .= $invalidSqlStr;
|
|
|
404
|
+ $dayWhere .= $invalidSqlStr;
|
|
|
405
|
+ }
|
|
|
406
|
+
|
|
395
|
407
|
$currentDate = date('Y-m-d');
|
|
396
|
408
|
// 上周的开始日期(周一)
|
|
397
|
409
|
$startDate = date('Y-m-d', strtotime('last Monday', strtotime($currentDate)));
|