diff --git a/src/Studio/Resource/Lattice.php b/src/Studio/Resource/Lattice.php index f0bd576..c268f85 100644 --- a/src/Studio/Resource/Lattice.php +++ b/src/Studio/Resource/Lattice.php @@ -14,7 +14,7 @@ namespace Singularity\HDK\Studio\Resource; use Hyperf\Di\Annotation\Inject; use Hyperf\HttpServer\Contract\RequestInterface; use Hyperf\Resource\Json\JsonResource; -use Singularity\HDK\Utils\Resource\ClassicResponse; +use Singularity\HDK\Core\Resource\ClassicResponse; /** * 晶格资源模型 @@ -74,9 +74,9 @@ class Lattice extends JsonResource 'a' => (float)$this->a, 'b' => (float)$this->b, 'c0' => (float)$this->c0, - 'scalingRatio' => (float)$this->pivot?->scaling_ratio, - 'evaluation' => LatticeEvaluation::make($this->evaluation), - 'material' => Material::collection($this->material), + 'scalingRatio' => $this->when(isset($this->pivot), (float)$this->pivot?->scaling_ratio), + 'evaluation' => LatticeEvaluation::make($this->whenLoaded('evaluation')), + 'material' => Material::collection($this->whenLoaded('material')), ]; } } \ No newline at end of file