diff --git a/app/services/system/SystemDeptService.php b/app/services/system/SystemDeptService.php index 10f56c06d4a4f4aad29d4b9f8f5b9b19c6c4c9d5..468387b56cfd047e8fab59fffa2ecadeb1387398 100644 --- a/app/services/system/SystemDeptService.php +++ b/app/services/system/SystemDeptService.php @@ -13,7 +13,8 @@ namespace app\services\system; use app\dao\system\SystemDeptDao; -use app\model\tp\system\SystemDept; +use app\model\tp\system\SystemDept as TpSystemDept; +use app\model\la\system\SystemDept as LaSystemDept; use madong\basic\BaseService; use madong\exception\AdminException; use support\Container; @@ -89,9 +90,9 @@ class SystemDeptService extends BaseService * * @param $id * - * @return \app\model\tp\system\SystemDept|null + * @return TpSystemDept | LaSystemDept */ - public function get($id): ?SystemDept + public function get($id) { $model = $this->dao->get($id, ['*'], ['leader']); if (!empty($model)) { diff --git a/madong/basic/BaseLaORMModel.php b/madong/basic/BaseLaORMModel.php index 2114618f53002f018182102704485c6f786151a7..30287de0c8f1e6e9ce20c93e730dba6db6e6f4a3 100644 --- a/madong/basic/BaseLaORMModel.php +++ b/madong/basic/BaseLaORMModel.php @@ -117,7 +117,7 @@ class BaseLaORMModel extends Model */ public function getData(string $field): mixed { - return $this->attributes[$field] ?? null; + return $this->{$field}??null; } /**