|
@@ -247,7 +247,7 @@ class RDService extends Service
|
|
|
public function rdList($data,$user){
|
|
public function rdList($data,$user){
|
|
|
$model = $this->rdCommon($data, $user);
|
|
$model = $this->rdCommon($data, $user);
|
|
|
$list = $this->limit($model,'',$data);
|
|
$list = $this->limit($model,'',$data);
|
|
|
- $list = $this->fillData($list,$user,$data);
|
|
|
|
|
|
|
+ $list = $this->fillData($list);
|
|
|
|
|
|
|
|
$list['count'] = $this->countTotal($list['data'], $user['header_default']);
|
|
$list['count'] = $this->countTotal($list['data'], $user['header_default']);
|
|
|
|
|
|
|
@@ -304,7 +304,7 @@ class RDService extends Service
|
|
|
return [true, $data];
|
|
return [true, $data];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public function fillData($data, $user, $search){
|
|
|
|
|
|
|
+ public function fillData($data){
|
|
|
if(empty($data['data'])) return $data;
|
|
if(empty($data['data'])) return $data;
|
|
|
|
|
|
|
|
$emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
|
|
$emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
|