|
|
@@ -38,6 +38,7 @@ class ExpendController extends BaseController
|
|
|
|
|
|
$where = ['mainId' => $this->mainId];
|
|
|
$where['payTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
+ $where['delStaffId'] = 0; //过滤掉已删除的
|
|
|
$list = ExpendClass::getAllByCondition($where, null, '*', null);
|
|
|
$arr = [];
|
|
|
$cat = [];
|
|
|
@@ -92,7 +93,7 @@ class ExpendController extends BaseController
|
|
|
{
|
|
|
ini_set('memory_limit', '2045M');
|
|
|
set_time_limit(0);
|
|
|
- $where = ['mainId' => $this->mainId, 'bx' => 0];
|
|
|
+ $where = ['mainId' => $this->mainId, 'bx' => 0, 'delStaffId' => 0];
|
|
|
$list = ExpendClass::getAllByCondition($where, null, '*', null);
|
|
|
$arr = [];
|
|
|
if (!empty($list)) {
|