From fa35b0f22984145e71e6a98045981a217a3bd14b Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Thu, 29 Feb 2024 09:52:49 +0800 Subject: [PATCH] update --- .../lists/project_process_management/ApplyWithSealLists.php | 2 +- .../logic/project_process_management/ApplyWithSealLogic.php | 2 ++ .../model/project_process_management/ApplyWithSeal.php | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php b/app/adminapi/lists/project_process_management/ApplyWithSealLists.php index 513479ee4..f3be7553f 100644 --- a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php +++ b/app/adminapi/lists/project_process_management/ApplyWithSealLists.php @@ -55,7 +55,7 @@ class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterf */ public function lists(): array { - return ApplyWithSeal::with(['projectInfo'])->where($this->searchWhere) + return ApplyWithSeal::with(['projectInfo', 'dept'])->where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() diff --git a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php index d2eb4f993..d390424df 100644 --- a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php +++ b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php @@ -49,6 +49,7 @@ class ApplyWithSealLogic extends BaseLogic 'name' => $params['name'], 'frequency' => $params['frequency'], 'limit' => $params['limit'], + 'org_id' => $params['org_id'], 'depar' => $params['depar'], 'stampman' => $params['stampman'], 'project_id' => $params['project_id'], @@ -93,6 +94,7 @@ class ApplyWithSealLogic extends BaseLogic 'name' => $params['name'], 'frequency' => $params['frequency'], 'limit' => $params['limit'], + 'org_id' => $params['org_id'], 'depar' => $params['depar'], 'stampman' => $params['stampman'], 'project_id' => $params['project_id'], diff --git a/app/common/model/project_process_management/ApplyWithSeal.php b/app/common/model/project_process_management/ApplyWithSeal.php index 1053b41ac..563857cf0 100644 --- a/app/common/model/project_process_management/ApplyWithSeal.php +++ b/app/common/model/project_process_management/ApplyWithSeal.php @@ -17,6 +17,7 @@ namespace app\common\model\project_process_management; use app\common\model\BaseModel; use app\common\model\cost_project\CostProject; +use app\common\model\dept\Dept; use think\model\concern\SoftDelete; @@ -35,4 +36,9 @@ class ApplyWithSeal extends BaseModel { return $this->hasOne(CostProject::class, 'id', 'project_id'); } + + public function dept() + { + return $this->hasOne(Dept::class, 'id', 'depar'); + } } \ No newline at end of file