From 93c0ffe44c83193015fbf416288f47bdeacfc6d9 Mon Sep 17 00:00:00 2001
From: ai567 <978713427@qq.com>
Date: Sat, 30 Nov 2024 16:34:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DlaORM=20=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8show=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/system/SystemDeptService.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/services/system/SystemDeptService.php b/app/services/system/SystemDeptService.php
index 10f56c0..468387b 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)) {
-- 
Gitee


From 534ac0fb59b427a688a21ee48178cd8741f5d292 Mon Sep 17 00:00:00 2001
From: ai567 <978713427@qq.com>
Date: Sat, 30 Nov 2024 16:34:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DlaORM=20=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8show=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/system/SystemDeptService.php | 7 ++++---
 madong/basic/BaseLaORMModel.php           | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/services/system/SystemDeptService.php b/app/services/system/SystemDeptService.php
index 10f56c0..468387b 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 2114618..30287de 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;
     }
 
     /**
-- 
Gitee