|
@@ -111,14 +111,10 @@ class AssetService extends Service
|
|
|
public function assetDetail($data){
|
|
|
if(empty($data['singleCode'])) return [false, '资产唯一编码不能为空'];
|
|
|
|
|
|
- $return = [];
|
|
|
- $asset = Asset::where('del_time',0)->where('singleCode', $data['singleCode'])->first();
|
|
|
- if(! empty($asset)) {
|
|
|
- $return = $asset->toArray();
|
|
|
- }else{
|
|
|
- $asset = AssetOther::where('del_time',0)->where('singleCode', $data['singleCode'])->first();
|
|
|
- if(! empty($asset)) $return = $asset->toArray();
|
|
|
- }
|
|
|
+ $query1 = Asset::where('del_time', 0)->whereIn('singleCode', $data['singleCode']);
|
|
|
+ $query2 = AssetOther::where('del_time', 0)->whereIn('singleCode', $data['singleCode']);
|
|
|
+ $results = $query1->union($query2)->get();
|
|
|
+ $return = $results->toArray();
|
|
|
|
|
|
return [true, 'asset' => $return];
|
|
|
}
|