youfeng

app/Service/EmployeeService.php

@@ -224,6 +224,7 @@ class EmployeeService extends Service
         if(! empty($data['state'])) $model->where('state',$data['state']);
         if(! empty($data['mobile'])) $model->where('mobile', 'LIKE', '%'.$data['mobile'].'%');
         if(! isset($data['all_emp'])) $model->where('id','<>',Employee::SPECIAL_ADMIN);
+        if(isset($data['is_admin'])) $model->where('is_admin', $data['is_admin']);
         if(! empty($data['role'])) {
             $emp = EmployeeRole::where('role_id',$data['role'])
                 ->where('del_time',0)

app/Service/StatisticsService.php

@@ -16,6 +16,9 @@ class StatisticsService extends Service
         $model = RevenueCostTotal::where('del_time',0)
             ->select($field)
             ->orderby('id', 'desc');
+
+        if(! empty($data['employee_id_1_title'])) $model->where('employee_id_1_title', 'LIKE', '%'.$data['employee_id_1_title'].'%');
+
         if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
             list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
             if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];