|
@@ -95,10 +95,22 @@ class AssetService extends Service
|
|
|
if(! empty($data['useDept'])) $model->where('useDept', 'LIKE', '%'.$data['useDept'].'%');
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
|
+ $list = $this->fillData($list);
|
|
|
|
|
|
return [true,$list];
|
|
|
}
|
|
|
|
|
|
+ public function fillData($data){
|
|
|
+ if(empty($data['data'])) return $data;
|
|
|
+
|
|
|
+ foreach ($data['data'] as $key => $value){
|
|
|
+ $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
+ $data['data'][$key]['upd_time'] = $value['upd_time'] ? date('Y-m-d H:i:s',$value['upd_time']) : '';
|
|
|
+ }
|
|
|
+
|
|
|
+ return $data;
|
|
|
+ }
|
|
|
+
|
|
|
public function AssetRule($data, $is_check = true){
|
|
|
if($this->isEmpty($data,'name')) return [false,'资产名称不能为空!'];
|
|
|
if($this->isEmpty($data,'singleCode')) return [false,'资产唯一码不能为空!'];
|